@expo/build-tools 18.13.1 → 19.0.0

package/dist/android/gradle.js

@@ -24,7 +24,7 @@ async function runGradleCommand(ctx, { logger, gradleCommand, androidDir, extraE
     logger.info(`Running 'gradlew ${gradleCommand}' in ${androidDir}`);
     await fs_extra_1.default.chmod(path_1.default.join(androidDir, 'gradlew'), 0o755);
     const verboseFlag = ctx.env['EAS_VERBOSE'] === '1' ? '--info' : '';
-    const spawnPromise = (0, turtle_spawn_1.default)('bash', ['-c', `./gradlew ${gradleCommand} ${verboseFlag}`], {
+    const spawnPromise = (0, turtle_spawn_1.default)('bash', ['-c', `./gradlew ${gradleCommand} --profile ${verboseFlag}`], {
         cwd: androidDir,
         logger,
         lineTransformer: (line) => {
@@ -35,7 +35,12 @@ async function runGradleCommand(ctx, { logger, gradleCommand, androidDir, extraE
                 return line;
             }
         },
-        env: { ...ctx.env, ...extraEnv, ...resolveVersionOverridesEnvs(ctx), LC_ALL: 'C.UTF-8' },
+        env: {
+            ...ctx.env,
+            ...extraEnv,
+            ...resolveVersionOverridesEnvs(ctx),
+            LC_ALL: 'C.UTF-8',
+        },
     });
     if (ctx.env.EAS_BUILD_RUNNER === 'eas-build' && process.platform === 'linux') {
         adjustOOMScore(spawnPromise, logger);

package/dist/android/gradleProfile.d.ts

@@ -0,0 +1,7 @@
+export interface GradleProfileTask {
+    path: string;
+    durationMs: number;
+    result: string;
+}
+export declare function parseGradleProfile(androidDir: string): Promise<GradleProfileTask[]>;
+export declare function formatGradleProfileReport(tasks: GradleProfileTask[]): string;

package/dist/android/gradleProfile.js

@@ -0,0 +1,190 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseGradleProfile = parseGradleProfile;
+exports.formatGradleProfileReport = formatGradleProfileReport;
+const fast_xml_parser_1 = require("fast-xml-parser");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+async function parseGradleProfile(androidDir) {
+    const profileDir = path_1.default.join(androidDir, 'build', 'reports', 'profile');
+    if (!(await fs_extra_1.default.pathExists(profileDir))) {
+        throw new Error(`Gradle profile directory not found at ${profileDir}`);
+    }
+    const files = await fs_extra_1.default.readdir(profileDir);
+    const htmlFile = files
+        .filter(f => f.startsWith('profile-') && f.endsWith('.html'))
+        .sort()
+        .pop();
+    if (!htmlFile) {
+        throw new Error(`No Gradle profile HTML found in ${profileDir}`);
+    }
+    const html = await fs_extra_1.default.readFile(path_1.default.join(profileDir, htmlFile), 'utf8');
+    // Locate the <h2>Task Execution</h2> heading and extract its <table>
+    const headingMatch = html.match(/<h2[^>]*>\s*Task Execution\s*<\/h2>/i);
+    if (!headingMatch || headingMatch.index === undefined) {
+        throw new Error('Could not find Task Execution section in Gradle profile');
+    }
+    const sectionStart = headingMatch.index;
+    const tableStart = html.indexOf('<table', sectionStart);
+    const tableEnd = html.indexOf('</table>', tableStart);
+    if (tableStart === -1 || tableEnd === -1) {
+        throw new Error('Could not find task execution table in Gradle profile');
+    }
+    const tableHtml = html.slice(tableStart, tableEnd + '</table>'.length);
+    const parser = new fast_xml_parser_1.XMLParser({
+        ignoreAttributes: true,
+        isArray: name => name === 'tr' || name === 'td',
+        trimValues: true,
+    });
+    const parsed = parser.parse(tableHtml);
+    const rows = parsed?.table?.tbody?.tr ?? parsed?.table?.tr ?? [];
+    const tasks = [];
+    for (const row of rows) {
+        const cells = row?.td;
+        if (!cells || cells.length < 2) {
+            continue;
+        }
+        const taskPath = String(cells[0] ?? '').trim();
+        const durationStr = String(cells[1] ?? '').trim();
+        const result = String(cells[2] ?? '').trim() || 'executed';
+        if (!taskPath || !durationStr) {
+            continue;
+        }
+        const durationMs = parseDurationToMs(durationStr);
+        tasks.push({ path: taskPath, durationMs, result: result.toLowerCase() });
+    }
+    return tasks;
+}
+function parseDurationToMs(duration) {
+    // Gradle profile durations can be like "1.234s", "0.045s", "12.5s"
+    const secondsMatch = duration.match(/^([\d.]+)s$/);
+    if (secondsMatch) {
+        return Math.round(parseFloat(secondsMatch[1]) * 1000);
+    }
+    return 0;
+}
+function formatSeconds(ms) {
+    const s = ms / 1000;
+    if (s < 0.1) {
+        return `${ms}ms`;
+    }
+    return `${s.toFixed(1)}s`;
+}
+function formatGradleProfileReport(tasks) {
+    // Filter out tasks under 1 second
+    const significantTasks = tasks.filter(t => t.durationMs >= 1000);
+    // Separate module totals from individual tasks
+    const moduleTotals = significantTasks.filter(t => t.result === '(total)');
+    const individualTasks = significantTasks.filter(t => t.result !== '(total)');
+    // Group individual tasks by their module prefix
+    const moduleChildren = new Map();
+    const orphanTasks = [];
+    for (const task of individualTasks) {
+        const parent = moduleTotals.find(m => task.path.startsWith(m.path + ':'));
+        if (parent) {
+            const children = moduleChildren.get(parent.path) ?? [];
+            children.push(task);
+            moduleChildren.set(parent.path, children);
+        }
+        else {
+            orphanTasks.push(task);
+        }
+    }
+    // Sort module totals by duration, sort children within each module
+    const sortedModules = [...moduleTotals].sort((a, b) => b.durationMs - a.durationMs);
+    for (const children of moduleChildren.values()) {
+        children.sort((a, b) => b.durationMs - a.durationMs);
+    }
+    orphanTasks.sort((a, b) => b.durationMs - a.durationMs);
+    // Build display rows: [displayName, task]
+    const rows = [];
+    for (const mod of sortedModules) {
+        rows.push({ displayName: mod.path, task: mod });
+        const children = moduleChildren.get(mod.path) ?? [];
+        for (let i = 0; i < children.length; i++) {
+            const isLast = i === children.length - 1;
+            const prefix = isLast ? '  └─ ' : '  ├─ ';
+            const shortName = children[i].path.slice(mod.path.length + 1);
+            rows.push({ displayName: prefix + shortName, task: children[i] });
+        }
+    }
+    for (const task of orphanTasks) {
+        rows.push({ displayName: task.path, task });
+    }
+    // Compute totals from individual tasks only (avoid double-counting)
+    const totalMs = individualTasks.reduce((sum, t) => sum + t.durationMs, 0);
+    const maxMs = totalMs || 1;
+    const nameWidth = Math.max(4, ...rows.map(r => r.displayName.length)) + 2;
+    const barMaxWidth = 20;
+    const header = '┌─' +
+        '─'.repeat(nameWidth) +
+        '─┬────────────┬──────────┬────────────┬─' +
+        '─'.repeat(barMaxWidth) +
+        '─┐';
+    const divider = '├─' +
+        '─'.repeat(nameWidth) +
+        '─┼────────────┼──────────┼────────────┼─' +
+        '─'.repeat(barMaxWidth) +
+        '─┤';
+    const footer = '└─' +
+        '─'.repeat(nameWidth) +
+        '─┴────────────┴──────────┴────────────┴─' +
+        '─'.repeat(barMaxWidth) +
+        '─┘';
+    const taskCount = individualTasks.length;
+    const cachedCount = individualTasks.filter(t => t.result !== 'executed').length;
+    const lines = [];
+    lines.push('Gradle Build — Task Execution Profile');
+    const cachedSuffix = cachedCount > 0 ? ` (${cachedCount} cached/up-to-date)` : '';
+    lines.push(`${taskCount} tasks${cachedSuffix}, total task time: ${formatSeconds(totalMs)}`);
+    lines.push('% Time = share of total task execution time');
+    lines.push('');
+    lines.push(header);
+    lines.push('│ ' +
+        'Task'.padEnd(nameWidth) +
+        ' │ ' +
+        'Duration'.padStart(10) +
+        ' │ ' +
+        '% Time'.padStart(8) +
+        ' │ ' +
+        'Result'.padEnd(10) +
+        ' │ ' +
+        ' '.repeat(barMaxWidth) +
+        ' │');
+    lines.push(divider);
+    for (const row of rows) {
+        const pct = totalMs === 0 ? 0 : (row.task.durationMs / totalMs) * 100;
+        const barLength = Math.round((row.task.durationMs / maxMs) * barMaxWidth);
+        const bar = '█'.repeat(barLength) + '░'.repeat(barMaxWidth - barLength);
+        const result = row.task.result === '(total)' ? 'total' : row.task.result;
+        lines.push('│ ' +
+            row.displayName.padEnd(nameWidth) +
+            ' │ ' +
+            formatSeconds(row.task.durationMs).padStart(10) +
+            ' │ ' +
+            `${pct.toFixed(1)}%`.padStart(8) +
+            ' │ ' +
+            result.padEnd(10) +
+            ' │ ' +
+            bar +
+            ' │');
+    }
+    lines.push(divider);
+    lines.push('│ ' +
+        'TOTAL'.padEnd(nameWidth) +
+        ' │ ' +
+        formatSeconds(totalMs).padStart(10) +
+        ' │ ' +
+        '100.0%'.padStart(8) +
+        ' │ ' +
+        ' '.repeat(10) +
+        ' │ ' +
+        ' '.repeat(barMaxWidth) +
+        ' │');
+    lines.push(footer);
+    lines.push('');
+    return lines.join('\n');
+}

package/dist/context.js

@@ -10,6 +10,7 @@ const core_1 = require("@urql/core");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const detectError_1 = require("./buildErrors/detectError");
+const datadog_1 = require("./datadog");
 const appConfig_1 = require("./utils/appConfig");
 const environmentSecrets_1 = require("./utils/environmentSecrets");
 const packageManager_1 = require("./utils/packageManager");
@@ -235,6 +236,13 @@ class BuildContext {
         }
         await this.collectAndUpdateEnvVariablesAsync();
         this.reportBuildPhaseStats?.({ buildPhase: this.buildPhase, result, durationMs });
+        if (this.job.platform) {
+            datadog_1.Datadog.distribution('eas.build.phase_duration', durationMs, {
+                build_phase: this.buildPhase.toLowerCase(),
+                platform: this.job.platform,
+                result,
+            });
+        }
         if (!doNotMarkEnd) {
             this.logger.info({ marker: eas_build_job_1.LogMarker.END_PHASE, result, durationMs }, `End phase: ${this.buildPhase}`);
         }

package/dist/datadog.d.ts

@@ -0,0 +1,11 @@
+type DatadogSetupOptions = {
+    expoApiV2BaseUrl: string;
+    turtleBuildId: string;
+    robotAccessToken: string;
+};
+export declare const Datadog: {
+    setup(opts: DatadogSetupOptions | null): void;
+    distribution(name: string, value: number, tags?: Record<string, string>): void;
+    flushAsync(): Promise<void>;
+};
+export {};

package/dist/datadog.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Datadog = void 0;
+const sentry_1 = require("./sentry");
+const turtleFetch_1 = require("./utils/turtleFetch");
+let setupOptions = null;
+let pendingMetricUploads = [];
+exports.Datadog = {
+    setup(opts) {
+        setupOptions = opts;
+    },
+    distribution(name, value, tags = {}) {
+        if (!setupOptions) {
+            return;
+        }
+        const { expoApiV2BaseUrl, turtleBuildId, robotAccessToken } = setupOptions;
+        const metrics = [
+            {
+                name,
+                type: 'distribution',
+                value,
+                tags,
+            },
+        ];
+        const uploadPromise = (0, turtleFetch_1.turtleFetch)(new URL(`turtle-builds/${turtleBuildId}/metrics`, expoApiV2BaseUrl).toString(), 'POST', {
+            json: { metrics },
+            headers: {
+                Authorization: `Bearer ${robotAccessToken}`,
+            },
+            retries: 2,
+        }).catch(err => {
+            sentry_1.Sentry.capture('Failed to report turtle build metric', err, {
+                extras: { metrics },
+            });
+        });
+        pendingMetricUploads.push(uploadPromise);
+    },
+    async flushAsync() {
+        await Promise.allSettled(pendingMetricUploads);
+    },
+};

package/dist/index.d.ts

@@ -6,5 +6,8 @@ export { ArtifactToUpload, Artifacts, BuildContext, BuildContextOptions, CacheMa
 export { PackageManager } from './utils/packageManager';
 export { findAndUploadXcodeBuildLogsAsync } from './ios/xcodeBuildLogs';
 export { Hook, runHookIfPresent } from './utils/hooks';
+export { parseGradleProfile, formatGradleProfileReport } from './android/gradleProfile';
+export type { GradleProfileTask } from './android/gradleProfile';
 export * from './generic';
+export { Datadog } from './datadog';
 export { Sentry } from './sentry';

package/dist/index.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Sentry = exports.runHookIfPresent = exports.Hook = exports.findAndUploadXcodeBuildLogsAsync = exports.PackageManager = exports.SkipNativeBuildError = exports.BuildContext = exports.GCSLoggerStream = exports.GCS = exports.Builders = void 0;
+exports.Sentry = exports.Datadog = exports.formatGradleProfileReport = exports.parseGradleProfile = exports.runHookIfPresent = exports.Hook = exports.findAndUploadXcodeBuildLogsAsync = exports.PackageManager = exports.SkipNativeBuildError = exports.BuildContext = exports.GCSLoggerStream = exports.GCS = exports.Builders = void 0;
 const Builders = __importStar(require("./builders"));
 exports.Builders = Builders;
 const LoggerStream_1 = __importDefault(require("./gcs/LoggerStream"));
@@ -56,6 +56,11 @@ Object.defineProperty(exports, "findAndUploadXcodeBuildLogsAsync", { enumerable:
 var hooks_1 = require("./utils/hooks");
 Object.defineProperty(exports, "Hook", { enumerable: true, get: function () { return hooks_1.Hook; } });
 Object.defineProperty(exports, "runHookIfPresent", { enumerable: true, get: function () { return hooks_1.runHookIfPresent; } });
+var gradleProfile_1 = require("./android/gradleProfile");
+Object.defineProperty(exports, "parseGradleProfile", { enumerable: true, get: function () { return gradleProfile_1.parseGradleProfile; } });
+Object.defineProperty(exports, "formatGradleProfileReport", { enumerable: true, get: function () { return gradleProfile_1.formatGradleProfileReport; } });
 __exportStar(require("./generic"), exports);
+var datadog_1 = require("./datadog");
+Object.defineProperty(exports, "Datadog", { enumerable: true, get: function () { return datadog_1.Datadog; } });
 var sentry_1 = require("./sentry");
 Object.defineProperty(exports, "Sentry", { enumerable: true, get: function () { return sentry_1.Sentry; } });

package/dist/steps/utils/android/gradle.js

@@ -14,7 +14,7 @@ async function runGradleCommand({ logger, gradleCommand, androidDir, env, extraE
     const verboseFlag = env['EAS_VERBOSE'] === '1' ? '--info' : '';
     logger.info(`Running 'gradlew ${gradleCommand} ${verboseFlag}' in ${androidDir}`);
     await fs_extra_1.default.chmod(path_1.default.join(androidDir, 'gradlew'), 0o755);
-    const spawnPromise = (0, turtle_spawn_1.default)('bash', ['-c', `./gradlew ${gradleCommand} ${verboseFlag}`], {
+    const spawnPromise = (0, turtle_spawn_1.default)('bash', ['-c', `./gradlew ${gradleCommand} --profile ${verboseFlag}`], {
         cwd: androidDir,
         logger,
         lineTransformer: (line) => {
@@ -25,7 +25,11 @@ async function runGradleCommand({ logger, gradleCommand, androidDir, env, extraE
                 return line;
             }
         },
-        env: { ...env, ...extraEnv, LC_ALL: 'C.UTF-8' },
+        env: {
+            ...env,
+            ...extraEnv,
+            LC_ALL: 'C.UTF-8',
+        },
     });
     if (env.EAS_BUILD_RUNNER === 'eas-build' && process.platform === 'linux') {
         adjustOOMScore(spawnPromise, logger);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.13.1",
+  "version": "19.0.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -37,17 +37,17 @@
   "dependencies": {
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
-    "@expo/downloader": "18.5.0",
-    "@expo/eas-build-job": "18.13.1",
+    "@expo/downloader": "19.0.0",
+    "@expo/eas-build-job": "19.0.0",
     "@expo/env": "^0.4.0",
-    "@expo/logger": "18.5.0",
+    "@expo/logger": "19.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": "18.13.1",
-    "@expo/template-file": "18.5.0",
-    "@expo/turtle-spawn": "18.5.0",
+    "@expo/steps": "19.0.0",
+    "@expo/template-file": "19.0.0",
+    "@expo/turtle-spawn": "19.0.0",
     "@expo/xcpretty": "^4.3.1",
     "@google-cloud/storage": "^7.11.2",
     "@sentry/node": "7.77.0",
@@ -99,5 +99,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "dbf597957dc93133d15e99298c55c0ad31b994c1"
+  "gitHead": "fc7c2950e773245d987c756b2bd2e8ba2ac6ee22"
 }