@expo/build-tools 19.0.0 → 19.0.2

package/dist/android/gradleProfile.js

@@ -10,8 +10,10 @@ 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');
+    // Gradle profile may not exist for all builds (e.g. custom, repack
+    // jobs). We should short circuit and not unnecessarily log.
     if (!(await fs_extra_1.default.pathExists(profileDir))) {
-        throw new Error(`Gradle profile directory not found at ${profileDir}`);
+        return [];
     }
     const files = await fs_extra_1.default.readdir(profileDir);
     const htmlFile = files

package/dist/builders/ios.js

@@ -20,6 +20,7 @@ const fastlane_1 = require("../ios/fastlane");
 const pod_1 = require("../ios/pod");
 const resign_1 = require("../ios/resign");
 const resolve_1 = require("../ios/resolve");
+const sentry_1 = require("../sentry");
 const xcactivitylog_1 = require("../steps/utils/ios/xcactivitylog");
 const restoreBuildCache_1 = require("../steps/functions/restoreBuildCache");
 const saveBuildCache_1 = require("../steps/functions/saveBuildCache");
@@ -158,17 +159,26 @@ async function buildAsync(ctx) {
             await credentialsManager.cleanUp();
         });
     }
-    if (ctx.env.EXPERIMENTAL_EAS_XCACTIVITYLOG === '1') {
-        const { derivedDataPath, workspacePath } = (0, nullthrows_1.default)(fastlaneResult);
-        await ctx.runBuildPhase(eas_build_job_1.BuildPhase.PARSE_XCACTIVITYLOG, async () => {
+    await ctx.runBuildPhase(eas_build_job_1.BuildPhase.PARSE_XCACTIVITYLOG, async () => {
+        if (ctx.isLocal) {
+            ctx.logger.info('Local builds skip build performance analysis.');
+            return;
+        }
+        try {
+            const { derivedDataPath, workspacePath } = (0, nullthrows_1.default)(fastlaneResult);
             await (0, xcactivitylog_1.parseAndReportXcactivitylog)({
                 derivedDataPath,
                 workspacePath,
                 logger: ctx.logger,
                 proxyBaseUrl: ctx.env.EAS_BUILD_COCOAPODS_CACHE_URL,
+                env: ctx.env,
             });
-        });
-    }
+        }
+        catch (err) {
+            sentry_1.Sentry.capture('Failed to parse xcactivitylog', err);
+            ctx.markBuildPhaseSkipped();
+        }
+    });
     await ctx.runBuildPhase(eas_build_job_1.BuildPhase.PRE_UPLOAD_ARTIFACTS_HOOK, async () => {
         await (0, hooks_1.runHookIfPresent)(ctx, hooks_1.Hook.PRE_UPLOAD_ARTIFACTS);
     });

package/dist/steps/functions/parseXcactivitylog.js

@@ -43,6 +43,7 @@ function parseXcactivitylogFunction() {
                 xclogparserVersion: version,
                 logger: stepCtx.logger,
                 proxyBaseUrl: env.EAS_BUILD_COCOAPODS_CACHE_URL,
+                env,
             });
         },
     });

package/dist/steps/utils/ios/xcactivitylog.d.ts

@@ -1,16 +1,18 @@
 import { bunyan } from '@expo/logger';
+import { BuildStepEnv } from '@expo/steps';
 import { z } from 'zod';
 /**
  * Never throws — best-effort observability that does not affect build status.
  * Failures route to Sentry via `Sentry.capture` for engineering triage;
  * users see only a generic skip message.
  */
-export declare function parseAndReportXcactivitylog({ derivedDataPath, workspacePath, xclogparserVersion, logger, proxyBaseUrl, }: {
+export declare function parseAndReportXcactivitylog({ derivedDataPath, workspacePath, xclogparserVersion, logger, proxyBaseUrl, env, }: {
     derivedDataPath: string;
     workspacePath: string;
     xclogparserVersion?: string;
     logger: bunyan;
     proxyBaseUrl?: string;
+    env: BuildStepEnv;
 }): Promise<void>;
 declare const XcactivitylogStepSchemaZ: z.ZodObject<{
     title: z.ZodOptional<z.ZodString>;

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

@@ -25,19 +25,40 @@ const XCLOGPARSER_OUTPUT_FILENAME = 'xcactivitylog.json';
  * Failures route to Sentry via `Sentry.capture` for engineering triage;
  * users see only a generic skip message.
  */
-async function parseAndReportXcactivitylog({ derivedDataPath, workspacePath, xclogparserVersion = DEFAULT_XCLOGPARSER_VERSION, logger, proxyBaseUrl, }) {
+async function parseAndReportXcactivitylog({ derivedDataPath, workspacePath, xclogparserVersion, logger, proxyBaseUrl, env, }) {
     let tempDir;
     let phase = 'creating_temp_directory';
     try {
         tempDir = await fs_extra_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'xclogparser-'));
-        phase = 'downloading_xclogparser';
-        const xclogparserPath = await downloadXclogparser(tempDir, xclogparserVersion, logger, proxyBaseUrl);
+        phase = 'resolving_xclogparser';
+        const preinstalledVersion = await detectPreinstalledXclogparserVersion(env);
+        let binaryPath;
+        let resolvedVersion;
+        if (preinstalledVersion &&
+            (!xclogparserVersion || preinstalledVersion === xclogparserVersion)) {
+            binaryPath = 'xclogparser';
+            resolvedVersion = preinstalledVersion;
+            logger.info(`Using preinstalled xclogparser ${resolvedVersion}.`);
+        }
+        else {
+            phase = 'downloading_xclogparser';
+            resolvedVersion = xclogparserVersion ?? DEFAULT_XCLOGPARSER_VERSION;
+            binaryPath = await downloadXclogparser({
+                tempDir,
+                version: resolvedVersion,
+                logger,
+                proxyBaseUrl,
+                env,
+            });
+            logger.info(`Using downloaded xclogparser ${resolvedVersion}.`);
+        }
         phase = 'running_xclogparser';
         const jsonOutputPath = await runXclogparser({
-            binaryPath: xclogparserPath,
+            binaryPath,
             derivedDataPath,
             workspacePath,
             outputDir: tempDir,
+            env,
         });
         phase = 'parsing_xclogparser_output';
         const data = XcactivitylogDataSchemaZ.parse(JSON.parse(await fs_extra_1.default.readFile(jsonOutputPath, 'utf8')));
@@ -54,13 +75,21 @@ async function parseAndReportXcactivitylog({ derivedDataPath, workspacePath, xcl
         }
     }
 }
-async function downloadXclogparser(tempDir, version, logger, proxyBaseUrl) {
+async function detectPreinstalledXclogparserVersion(env) {
+    const result = await (0, results_1.asyncResult)((0, turtle_spawn_1.default)('xclogparser', ['version'], { stdio: 'pipe', env }));
+    if (!result.ok) {
+        return null;
+    }
+    const match = result.value.stdout.match(/(\d+\.\d+\.\d+)/);
+    return match ? `v${match[1]}` : null;
+}
+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 });
     if (proxiedUrl) {
-        const proxiedDownloadResult = await (0, results_1.asyncResult)(downloadAndUnpackXclogparser({ tempDir, zipPath, sourceUrl: proxiedUrl }));
+        const proxiedDownloadResult = await (0, results_1.asyncResult)(downloadAndUnpackXclogparser({ tempDir, zipPath, sourceUrl: proxiedUrl, env }));
         if (!proxiedDownloadResult.ok) {
             logger.debug({ err: proxiedDownloadResult.reason }, 'Failed to prepare xclogparser via the proxy path; falling back to the direct URL');
             await cleanupXclogparserArtifacts({ tempDir, zipPath });
@@ -69,14 +98,14 @@ async function downloadXclogparser(tempDir, version, logger, proxyBaseUrl) {
             return proxiedDownloadResult.value;
         }
     }
-    return await downloadAndUnpackXclogparser({ tempDir, zipPath, sourceUrl: directUrl });
+    return await downloadAndUnpackXclogparser({ tempDir, zipPath, sourceUrl: directUrl, env });
 }
-async function downloadAndUnpackXclogparser({ tempDir, zipPath, sourceUrl, }) {
+async function downloadAndUnpackXclogparser({ tempDir, zipPath, sourceUrl, env, }) {
     await (0, downloader_1.default)(sourceUrl, zipPath, { retry: 3, timeout: XCLOGPARSER_DOWNLOAD_TIMEOUT_MS });
-    return await unpackXclogparser({ tempDir, zipPath });
+    return await unpackXclogparser({ tempDir, zipPath, env });
 }
-async function unpackXclogparser({ tempDir, zipPath, }) {
-    await (0, turtle_spawn_1.default)('unzip', ['-q', zipPath, '-d', tempDir], { stdio: 'pipe' });
+async function unpackXclogparser({ tempDir, zipPath, env, }) {
+    await (0, turtle_spawn_1.default)('unzip', ['-q', zipPath, '-d', tempDir], { stdio: 'pipe', env });
     const binaryPath = path_1.default.join(tempDir, 'xclogparser');
     await fs_extra_1.default.chmod(binaryPath, 0o755);
     return binaryPath;
@@ -85,7 +114,7 @@ async function cleanupXclogparserArtifacts({ tempDir, zipPath, }) {
     await (0, results_1.asyncResult)(fs_extra_1.default.rm(zipPath, { force: true }));
     await (0, results_1.asyncResult)(fs_extra_1.default.rm(path_1.default.join(tempDir, 'xclogparser'), { force: true }));
 }
-async function runXclogparser({ binaryPath, derivedDataPath, workspacePath, outputDir, }) {
+async function runXclogparser({ binaryPath, derivedDataPath, workspacePath, outputDir, env, }) {
     const outputPath = path_1.default.join(outputDir, XCLOGPARSER_OUTPUT_FILENAME);
     await (0, turtle_spawn_1.default)(binaryPath, [
         'parse',
@@ -95,9 +124,12 @@ async function runXclogparser({ binaryPath, derivedDataPath, workspacePath, outp
         workspacePath,
         '--reporter',
         'json',
+        '--omit_warnings',
+        '--omit_notes',
+        '--trunc_large_issues',
         '--output',
         outputPath,
-    ], { stdio: 'pipe' });
+    ], { stdio: 'pipe', env });
     return outputPath;
 }
 const XcactivitylogStepSchemaZ = zod_1.z.object({
@@ -274,7 +306,7 @@ function formatReport(data) {
         ' │ ' +
         '100.0%'.padStart(pctWidth) +
         ' │ ' +
-        'n/a'.padStart(wallWidth) +
+        ' '.repeat(wallWidth) +
         ' │ ' +
         ' '.repeat(barMaxWidth) +
         ' │');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "19.0.0",
+  "version": "19.0.2",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -99,5 +99,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "fc7c2950e773245d987c756b2bd2e8ba2ac6ee22"
+  "gitHead": "b64f25b36dd01aec10a03a503ab35e9f9fb5be41"
 }