@expo/build-tools 18.2.0 → 18.5.0

package/dist/utils/appConfig.js

@@ -8,18 +8,49 @@ const config_1 = require("@expo/config");
 const env_1 = require("@expo/env");
 const logger_1 = require("@expo/logger");
 const semver_1 = __importDefault(require("semver"));
-function readAppConfig({ projectDir, env, logger, sdkVersion, }) {
+const expoCli_1 = require("./expoCli");
+async function readAppConfig(params) {
+    const shouldLoadEnvVarsFromDotenvFile = params.sdkVersion && semver_1.default.satisfies(params.sdkVersion, '>=49');
+    if (shouldLoadEnvVarsFromDotenvFile) {
+        const envVarsFromDotenvFile = (0, env_1.load)(params.projectDir);
+        const env = { ...params.env, ...envVarsFromDotenvFile };
+        params = { ...params, env };
+    }
+    // Reading the app config is done in two steps/attempts. We first attempt to run `expo config` as a CLI,
+    try {
+        return await getAppConfigFromExpo(params);
+    }
+    catch (error) {
+        params.logger.warn('Failed to read the app config file with `expo config` command:\n' +
+            `${error?.message || error}`);
+    }
+    // If this fails, we fall back to directly using `@expo/config`
+    // This can fail, since it's tied to a specific SDK version, so reading for older SDKs isn't guaranteed to work
+    return getAppConfigFromExpoConfig(params);
+}
+async function getAppConfigFromExpo({ projectDir, env, }) {
+    const result = await (0, expoCli_1.expoCommandAsync)(projectDir, ['config', '--json', '--full', '--type', 'public'], { env });
+    let parsed;
+    try {
+        parsed = JSON.parse(result.stdout);
+    }
+    catch {
+        throw new Error(`Failed to parse JSON output from 'expo config'.\nOutput: ${result.stdout.slice(0, 500)}`);
+    }
+    if (!('exp' in parsed)) {
+        throw new Error(`Unexpected output from 'expo config': missing 'exp' field.`);
+    }
+    return parsed;
+}
+function getAppConfigFromExpoConfig({ projectDir, env, logger, }) {
     const originalProcessExit = process.exit;
     const originalProcessCwd = process.cwd;
     const originalStdoutWrite = process.stdout.write;
     const originalStderrWrite = process.stderr.write;
     const originalProcessEnv = process.env;
     const stdoutStore = [];
-    const shouldLoadEnvVarsFromDotenvFile = sdkVersion && semver_1.default.satisfies(sdkVersion, '>=49');
-    const envVarsFromDotenvFile = shouldLoadEnvVarsFromDotenvFile ? (0, env_1.load)(projectDir) : {};
-    const newEnvsToUse = { ...env, ...envVarsFromDotenvFile };
     try {
-        process.env = newEnvsToUse;
+        process.env = env;
         process.exit = () => {
             throw new Error('Failed to evaluate app config file');
         };

package/dist/utils/expoCli.d.ts

@@ -0,0 +1,4 @@
+import { type SpawnOptions } from '@expo/turtle-spawn';
+export declare class ExpoCLIModuleNotFoundError extends Error {
+}
+export declare function expoCommandAsync(projectDir: string, args: string[], options: Omit<SpawnOptions, 'cwd'>): Promise<import("@expo/spawn-async").SpawnResult>;

package/dist/utils/expoCli.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExpoCLIModuleNotFoundError = void 0;
+exports.expoCommandAsync = expoCommandAsync;
+const resolve_from_1 = __importDefault(require("resolve-from"));
+const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
+class ExpoCLIModuleNotFoundError extends Error {
+}
+exports.ExpoCLIModuleNotFoundError = ExpoCLIModuleNotFoundError;
+function resolveExpoCLI(projectRoot) {
+    try {
+        return (resolve_from_1.default.silent(projectRoot, 'expo/bin/cli') ?? (0, resolve_from_1.default)(projectRoot, 'expo/bin/cli.js'));
+    }
+    catch (e) {
+        if (e.code === 'MODULE_NOT_FOUND') {
+            throw new ExpoCLIModuleNotFoundError(`The \`expo\` package was not found.`);
+        }
+        throw e;
+    }
+}
+async function expoCommandAsync(projectDir, args, options) {
+    const expoCliPath = resolveExpoCLI(projectDir);
+    return (0, turtle_spawn_1.default)(expoCliPath, args, {
+        cwd: projectDir,
+        stdio: 'pipe',
+        ...options,
+        env: {
+            ...options.env,
+            // NOTE: If we're reading user configs, if a user has set this, it might cause excessive output
+            // that can stop the command from being readable
+            EXPO_DEBUG: '0',
+        },
+    });
+}

package/dist/utils/expoUpdates.d.ts

@@ -27,5 +27,5 @@ export declare function resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync({ c
 } | null>;
 export declare function getChannelAsync(ctx: BuildContext<Job>): Promise<string | null>;
 export declare function getRuntimeVersionAsync(ctx: BuildContext<Job>): Promise<string | null>;
-export declare function isEASUpdateConfigured(ctx: BuildContext<Job>): boolean;
+export declare function isEASUpdateConfigured(ctx: BuildContext<Job>): Promise<boolean>;
 export {};

package/dist/utils/expoUpdates.js

@@ -86,7 +86,7 @@ This would cause any updates published on the local machine to not be compatible
         await logDiffFingerprints({ resolvedRuntime, ctx });
         throw new Error('Runtime version calculated on local machine not equal to runtime version calculated during build.');
     }
-    if (isEASUpdateConfigured(ctx)) {
+    if (await isEASUpdateConfigured(ctx)) {
         if (ctx.job.updates?.channel !== undefined) {
             await configureEASExpoUpdatesAsync(ctx);
         }
@@ -101,7 +101,7 @@ This would cause any updates published on the local machine to not be compatible
                 // NO-OP: Development clients don't need to have a channel set
             }
             else {
-                const easUpdateUrl = ctx.appConfig.updates?.url ?? null;
+                const easUpdateUrl = (await ctx.appConfig).updates?.url ?? null;
                 const jobProfile = ctx.job.buildProfile ?? null;
                 ctx.logger.warn(`This build has an invalid EAS Update configuration: update.url is set to "${easUpdateUrl}" in app config, but a channel is not specified${jobProfile ? '' : ` for the current build profile "${jobProfile}" in eas.json`}.`);
                 ctx.logger.warn(`- No channel will be set and EAS Update will be disabled for the build.`);
@@ -156,8 +156,8 @@ async function getRuntimeVersionAsync(ctx) {
             throw new Error(`Platform is not supported.`);
     }
 }
-function isEASUpdateConfigured(ctx) {
-    const rawUrl = ctx.appConfig.updates?.url;
+async function isEASUpdateConfigured(ctx) {
+    const rawUrl = (await ctx.appConfig).updates?.url;
     if (!rawUrl) {
         return false;
     }

package/dist/utils/gradleCacheKey.d.ts

@@ -0,0 +1,2 @@
+export declare const GRADLE_CACHE_KEY_PREFIX = "android-gradle-cache-";
+export declare function generateGradleCacheKeyAsync(workingDirectory: string): Promise<string>;

package/dist/utils/gradleCacheKey.js

@@ -0,0 +1,56 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GRADLE_CACHE_KEY_PREFIX = void 0;
+exports.generateGradleCacheKeyAsync = generateGradleCacheKeyAsync;
+const PackageManagerUtils = __importStar(require("@expo/package-manager"));
+const steps_1 = require("@expo/steps");
+const path_1 = __importDefault(require("path"));
+const packageManager_1 = require("./packageManager");
+exports.GRADLE_CACHE_KEY_PREFIX = 'android-gradle-cache-';
+async function generateGradleCacheKeyAsync(workingDirectory) {
+    const packagerRunDir = (0, packageManager_1.findPackagerRootDir)(workingDirectory);
+    const manager = PackageManagerUtils.createForProject(packagerRunDir);
+    const lockPath = path_1.default.join(packagerRunDir, manager.lockFile);
+    try {
+        return `${exports.GRADLE_CACHE_KEY_PREFIX}${(0, steps_1.hashFiles)([lockPath])}`;
+    }
+    catch (err) {
+        throw new Error(`Failed to read lockfile for Gradle cache key generation: ${err instanceof Error ? err.message : err}`);
+    }
+}

package/dist/utils/packageManager.d.ts

@@ -1,3 +1,4 @@
+import { type bunyan } from '@expo/logger';
 export declare enum PackageManager {
     YARN = "yarn",
     NPM = "npm",
@@ -5,6 +6,15 @@ export declare enum PackageManager {
     BUN = "bun"
 }
 export declare function resolvePackageManager(directory: string): PackageManager;
+/**
+ * Get the version of a package from the dist-tags.
+ * Returns null if the version cannot be resolved.
+ */
+export declare function resolvePackageVersionAsync({ logger, packageName, distTag, }: {
+    logger: bunyan;
+    packageName: string;
+    distTag: string;
+}): Promise<string | null>;
 export declare function findPackagerRootDir(currentDir: string): string;
 export declare function isAtLeastNpm7Async(): Promise<boolean>;
 export declare function shouldUseFrozenLockfile({ env, sdkVersion, reactNativeVersion, }: {

package/dist/utils/packageManager.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageManager = void 0;
 exports.resolvePackageManager = resolvePackageManager;
+exports.resolvePackageVersionAsync = resolvePackageVersionAsync;
 exports.findPackagerRootDir = findPackagerRootDir;
 exports.isAtLeastNpm7Async = isAtLeastNpm7Async;
 exports.shouldUseFrozenLockfile = shouldUseFrozenLockfile;
@@ -73,6 +74,26 @@ function resolvePackageManager(directory) {
         return PackageManager.YARN;
     }
 }
+/**
+ * Get the version of a package from the dist-tags.
+ * Returns null if the version cannot be resolved.
+ */
+async function resolvePackageVersionAsync({ logger, packageName, distTag, }) {
+    try {
+        const { stdout } = await (0, turtle_spawn_1.default)('npm', ['view', packageName, 'dist-tags', '--json'], {
+            stdio: 'pipe',
+        });
+        const distTags = JSON.parse(stdout);
+        if (distTag in distTags) {
+            return distTags[distTag];
+        }
+    }
+    catch (e) {
+        const message = e instanceof Error ? e.message : String(e);
+        logger.warn(`Unable to resolve version for ${packageName}@${distTag}: ${message}`);
+    }
+    return null;
+}
 function findPackagerRootDir(currentDir) {
     return PackageManagerUtils.resolveWorkspaceRoot(currentDir) ?? currentDir;
 }

package/dist/utils/stepMetrics.d.ts

@@ -1,9 +1,9 @@
 import { bunyan } from '@expo/logger';
-import { StepMetricsCollection } from '@expo/steps';
+import { StepMetric } from '@expo/steps';
 export declare function uploadStepMetricsToWwwAsync({ workflowJobId, robotAccessToken, expoApiV2BaseUrl, stepMetrics, logger, }: {
     workflowJobId: string;
     robotAccessToken: string;
     expoApiV2BaseUrl: string;
-    stepMetrics: StepMetricsCollection;
+    stepMetrics: StepMetric[];
     logger: bunyan;
 }): Promise<void>;

package/dist/utils/stepMetrics.js

@@ -3,22 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadStepMetricsToWwwAsync = uploadStepMetricsToWwwAsync;
 const turtleFetch_1 = require("./turtleFetch");
 async function uploadStepMetricsToWwwAsync({ workflowJobId, robotAccessToken, expoApiV2BaseUrl, stepMetrics, logger, }) {
-    if (stepMetrics.length === 0) {
-        logger.debug('No step metrics to upload');
-        return;
-    }
     try {
         await (0, turtleFetch_1.turtleFetch)(new URL(`workflows/${workflowJobId}/metrics`, expoApiV2BaseUrl).toString(), 'POST', {
             json: { stepMetrics },
-            headers: {
-                Authorization: `Bearer ${robotAccessToken}`,
-            },
-            timeout: 20000,
+            headers: { Authorization: `Bearer ${robotAccessToken}` },
+            timeout: 5000,
+            retries: 2,
             logger,
         });
-        logger.info(`Uploaded ${stepMetrics.length} step metrics`);
     }
     catch {
-        // Don't display unactionable error to the user, let's send it to Sentry in the future
+        // Don't fail the build for metrics — silently give up
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.2.0",
+  "version": "18.5.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -24,30 +24,30 @@
     "prebuild": "yarn gql",
     "build": "tsc",
     "typecheck": "tsc",
-    "prepack": "rm -rf dist *.tsbuildinfo && yarn gql && tsc -p tsconfig.build.json",
+    "prepack": "rimraf dist \"*.tsbuildinfo\" && yarn gql && tsc -p tsconfig.build.json",
     "jest-unit": "jest --config jest/unit-config.ts",
     "jest-integration": "jest --config jest/integration-config.ts",
     "jest-unit-watch": "jest --config jest/unit-config.ts --watch",
     "jest-integration-watch": "jest --config jest/integration-config.ts --watch",
-    "clean": "rm -rf node_modules dist coverage *.tsbuildinfo",
+    "clean": "rimraf node_modules dist coverage \"*.tsbuildinfo\"",
     "gql": "gql.tada generate-schema ${API_SERVER_URL:-https://api.expo.dev}/graphql --output ./schema.graphql && gql.tada generate-output",
     "gql:local": "API_SERVER_URL=http://api.expo.test yarn gql",
     "test": "yarn jest-unit"
   },
   "dependencies": {
-    "@expo/config": "10.0.6",
-    "@expo/config-plugins": "9.0.12",
-    "@expo/downloader": "18.0.1",
-    "@expo/eas-build-job": "18.2.0",
+    "@expo/config": "55.0.10",
+    "@expo/config-plugins": "55.0.7",
+    "@expo/downloader": "18.5.0",
+    "@expo/eas-build-job": "18.5.0",
     "@expo/env": "^0.4.0",
-    "@expo/logger": "18.0.1",
+    "@expo/logger": "18.5.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.2.0",
-    "@expo/template-file": "18.0.1",
-    "@expo/turtle-spawn": "18.0.1",
+    "@expo/steps": "18.5.0",
+    "@expo/template-file": "18.5.0",
+    "@expo/turtle-spawn": "18.5.0",
     "@expo/xcpretty": "^4.3.1",
     "@google-cloud/storage": "^7.11.2",
     "@urql/core": "^6.0.1",
@@ -75,7 +75,7 @@
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@expo/repack-app": "~0.2.5",
+    "@expo/repack-app": "~0.4.1",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.4",
@@ -91,11 +91,12 @@
     "jest": "^29.7.0",
     "memfs": "^4.17.1",
     "nock": "13.4.0",
+    "rimraf": "3.0.2",
     "ts-jest": "^29.1.4",
     "ts-mockito": "^2.6.1",
     "tslib": "^2.6.3",
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "5f400d77660990422c6976a65dfb41f99374c5cc"
+  "gitHead": "2e2dddb59ae9df5ad2395c74f77701341103b62e"
 }

package/dist/android/gradleConfig.d.ts

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

package/dist/android/gradleConfig.js

@@ -1,47 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureBuildGradle = configureBuildGradle;
-const config_plugins_1 = require("@expo/config-plugins");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const EasBuildGradle_1 = require("../templates/EasBuildGradle");
-const APPLY_EAS_BUILD_GRADLE_LINE = 'apply from: "./eas-build.gradle"';
-async function configureBuildGradle(ctx) {
-    ctx.logger.info('Injecting signing config into build.gradle');
-    if (await fs_extra_1.default.pathExists(getEasBuildGradlePath(ctx.getReactNativeProjectDirectory()))) {
-        ctx.markBuildPhaseHasWarnings();
-        ctx.logger.warn('eas-build.gradle script is deprecated, please remove it from your project.');
-    }
-    await deleteEasBuildGradle(ctx.getReactNativeProjectDirectory());
-    await createEasBuildGradle(ctx.getReactNativeProjectDirectory());
-    await addApplyToBuildGradle(ctx.getReactNativeProjectDirectory());
-}
-async function deleteEasBuildGradle(projectRoot) {
-    const easBuildGradlePath = getEasBuildGradlePath(projectRoot);
-    await fs_extra_1.default.remove(easBuildGradlePath);
-}
-function getEasBuildGradlePath(projectRoot) {
-    return path_1.default.join(projectRoot, 'android/app/eas-build.gradle');
-}
-async function createEasBuildGradle(projectRoot) {
-    const easBuildGradlePath = getEasBuildGradlePath(projectRoot);
-    await fs_extra_1.default.writeFile(easBuildGradlePath, EasBuildGradle_1.EasBuildGradle);
-}
-async function addApplyToBuildGradle(projectRoot) {
-    const buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectRoot);
-    const buildGradleContents = await fs_extra_1.default.readFile(path_1.default.join(buildGradlePath), 'utf8');
-    if (hasLine(buildGradleContents, APPLY_EAS_BUILD_GRADLE_LINE)) {
-        return;
-    }
-    await fs_extra_1.default.writeFile(buildGradlePath, `${buildGradleContents.trim()}\n${APPLY_EAS_BUILD_GRADLE_LINE}\n`);
-}
-function hasLine(haystack, needle) {
-    return (haystack
-        .replace(/\r\n/g, '\n')
-        .split('\n')
-        // Check for both single and double quotes
-        .some(line => line === needle || line === needle.replace(/"/g, "'")));
-}

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

@@ -1,9 +0,0 @@
-import { BuildFunction } from '@expo/steps';
-import { CustomBuildContext } from '../../customBuildContext';
-export declare function createInternalEasMaestroTestFunction(ctx: CustomBuildContext): BuildFunction;
-export declare function getMaestroTestCommand(params: {
-    flow_path: string;
-    output_format: string | undefined;
-    /** Unused if `output_format` is undefined */
-    output_path: string;
-}): [command: string, ...args: string[]];