@expo/build-tools 21.5.0 → 21.6.0

package/dist/builders/custom.js

@@ -15,7 +15,6 @@ const projectSources_1 = require("../common/projectSources");
 const customBuildContext_1 = require("../customBuildContext");
 const datadog_1 = require("../datadog");
 const xcodeBuildLogs_1 = require("../ios/xcodeBuildLogs");
-const compositeFunctions_1 = require("../steps/compositeFunctions");
 const easFunctionGroups_1 = require("../steps/easFunctionGroups");
 const easFunctions_1 = require("../steps/easFunctions");
 const retry_1 = require("../utils/retry");
@@ -55,11 +54,13 @@ async function runCustomBuildAsync(ctx) {
                     steps: ctx.job.steps,
                     hooks: ctx.job.hooks,
                     // Eager for job steps (always run), lazy loader for hooks (running anchors only).
-                    compositeFunctionCatalog: await (0, compositeFunctions_1.buildCompositeFunctionCatalogAsync)(projectRoot, {
-                        steps: ctx.job.steps,
+                    compositeFunctionCatalog: await (0, steps_1.buildLocalCompositeFunctionCatalogAsync)(projectRoot, {
+                        rootSteps: ctx.job.steps,
+                        logger: ctx.logger,
+                    }),
+                    loadCompositeFunction: (0, steps_1.createLocalCompositeFunctionLoader)(projectRoot, {
                         logger: ctx.logger,
                     }),
-                    loadCompositeFunction: (0, compositeFunctions_1.createCompositeFunctionLoader)(projectRoot, ctx.logger),
                 })
                 : new steps_1.BuildConfigParser(globalContext, {
                     externalFunctions: easFunctions,

package/dist/common/jobHooks.js

@@ -4,7 +4,6 @@ exports.parseJobHooksAsync = parseJobHooksAsync;
 const eas_build_job_1 = require("@expo/eas-build-job");
 const steps_1 = require("@expo/steps");
 const customBuildContext_1 = require("../customBuildContext");
-const compositeFunctions_1 = require("../steps/compositeFunctions");
 const easFunctionGroups_1 = require("../steps/easFunctionGroups");
 const easFunctions_1 = require("../steps/easFunctions");
 /**
@@ -60,7 +59,7 @@ async function parseJobHooksAsync(ctx, wrappedAnchors) {
     const hookEntriesByKey = {};
     const orderedSteps = [];
     const compositeFunctionCatalog = {};
-    const loadCompositeFunction = (0, compositeFunctions_1.createCompositeFunctionLoader)(ctx.getReactNativeProjectDirectory(), ctx.logger);
+    const loadCompositeFunction = (0, steps_1.createLocalCompositeFunctionLoader)(ctx.getReactNativeProjectDirectory(), { logger: ctx.logger });
     for (const anchor of wrappedAnchors) {
         for (const side of ['before', 'after']) {
             const key = `${side}_${anchor}`;

package/dist/generic.js

@@ -11,7 +11,6 @@ const promises_1 = __importDefault(require("fs/promises"));
 const nullthrows_1 = __importDefault(require("nullthrows"));
 const projectSources_1 = require("./common/projectSources");
 const customBuildContext_1 = require("./customBuildContext");
-const compositeFunctions_1 = require("./steps/compositeFunctions");
 const easFunctionGroups_1 = require("./steps/easFunctionGroups");
 const easFunctions_1 = require("./steps/easFunctions");
 const outputs_1 = require("./utils/outputs");
@@ -38,8 +37,8 @@ async function runGenericJobAsync(ctx) {
         try {
             const projectRoot = ctx.getReactNativeProjectDirectory(customBuildCtx.projectSourceDirectory);
             // Eager for job steps (always run), lazy loader for hooks (running anchors only).
-            const compositeFunctionCatalog = await (0, compositeFunctions_1.buildCompositeFunctionCatalogAsync)(projectRoot, {
-                steps: ctx.job.steps,
+            const compositeFunctionCatalog = await (0, steps_1.buildLocalCompositeFunctionCatalogAsync)(projectRoot, {
+                rootSteps: ctx.job.steps,
                 logger: ctx.logger,
             });
             const parser = new steps_1.StepsConfigParser(globalContext, {
@@ -48,7 +47,9 @@ async function runGenericJobAsync(ctx) {
                 steps: ctx.job.steps,
                 hooks: ctx.job.hooks,
                 compositeFunctionCatalog,
-                loadCompositeFunction: (0, compositeFunctions_1.createCompositeFunctionLoader)(projectRoot, ctx.logger),
+                loadCompositeFunction: (0, steps_1.createLocalCompositeFunctionLoader)(projectRoot, {
+                    logger: ctx.logger,
+                }),
             });
             return await parser.parseAsync();
         }

package/dist/utils/easCli.d.ts

@@ -1,5 +1,7 @@
 import { SpawnOptions, SpawnResult } from '@expo/turtle-spawn';
 import { Env } from '@expo/eas-build-job';
+/** Test-only: clears the memoized versions promise so each test fetches fresh. */
+export declare function resetCachedEasCliVersionsForTest(): void;
 export declare function resolveEasCommandPrefixAndEnvAsync(): Promise<{
     cmd: string;
     args: string[];

package/dist/utils/easCli.js

@@ -3,11 +3,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetCachedEasCliVersionsForTest = resetCachedEasCliVersionsForTest;
 exports.resolveEasCommandPrefixAndEnvAsync = resolveEasCommandPrefixAndEnvAsync;
 exports.runEasCliCommand = runEasCliCommand;
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const eas_build_job_1 = require("@expo/eas-build-job");
 const packageManager_1 = require("./packageManager");
+const sentry_1 = require("../sentry");
+let cachedEasCliVersionsPromise;
+/**
+ * Resolves the `eas-cli` versions to install for staging/production. Prefers the
+ * versions committed to `cli-versions.json` (fetched from expo/eas-cli); on any
+ * failure (e.g. GitHub is unreachable or slow) reports to Sentry and falls back
+ * to the `latest-eas-build*` npm dist-tags so the build can still proceed.
+ *
+ * Memoized: `resolveEasCommandPrefixAndEnvAsync` runs more than once per build,
+ * so the (never-rejecting) result promise is cached to fetch GitHub at most once
+ * per process.
+ */
+async function resolveEasCliVersionsAsync() {
+    if (!cachedEasCliVersionsPromise) {
+        cachedEasCliVersionsPromise = fetchEasCliVersionsWithFallbackAsync();
+    }
+    return await cachedEasCliVersionsPromise;
+}
+async function fetchEasCliVersionsWithFallbackAsync() {
+    try {
+        return await (0, eas_build_job_1.fetchEasCliVersionsAsync)();
+    }
+    catch (error) {
+        const message = error instanceof eas_build_job_1.EasCliVersionsFetchTimeoutError
+            ? 'Timed out fetching cli-versions.json; falling back to npm dist-tags'
+            : 'Failed to fetch cli-versions.json; falling back to npm dist-tags';
+        sentry_1.Sentry.capture(message, error instanceof Error ? error : new Error(String(error)), {
+            level: 'warning',
+        });
+        return { STAGING: eas_build_job_1.EasCliNpmTags.STAGING, PRODUCTION: eas_build_job_1.EasCliNpmTags.PRODUCTION };
+    }
+}
+/** Test-only: clears the memoized versions promise so each test fetches fresh. */
+function resetCachedEasCliVersionsForTest() {
+    cachedEasCliVersionsPromise = undefined;
+}
 async function probeEasdAsync() {
     try {
         const result = await (0, turtle_spawn_1.default)('easd', ['--help'], {
@@ -25,23 +62,26 @@ async function resolveEasCommandPrefixAndEnvAsync() {
         if (await probeEasdAsync()) {
             return { cmd: 'easd', args: [], extraEnv: {} };
         }
+        const versions = await resolveEasCliVersionsAsync();
         return {
             cmd: 'npx',
-            args: [...npxArgsPrefix, `eas-cli@${eas_build_job_1.EasCliNpmTags.STAGING}`],
+            args: [...npxArgsPrefix, `eas-cli@${versions.STAGING}`],
             extraEnv: {},
         };
     }
     else if (process.env.ENVIRONMENT === 'staging') {
+        const versions = await resolveEasCliVersionsAsync();
         return {
             cmd: 'npx',
-            args: [...npxArgsPrefix, `eas-cli@${eas_build_job_1.EasCliNpmTags.STAGING}`],
+            args: [...npxArgsPrefix, `eas-cli@${versions.STAGING}`],
             extraEnv: { EXPO_STAGING: '1' },
         };
     }
     else {
+        const versions = await resolveEasCliVersionsAsync();
         return {
             cmd: 'npx',
-            args: [...npxArgsPrefix, `eas-cli@${eas_build_job_1.EasCliNpmTags.PRODUCTION}`],
+            args: [...npxArgsPrefix, `eas-cli@${versions.PRODUCTION}`],
             extraEnv: {},
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "21.5.0",
+  "version": "21.6.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -39,14 +39,14 @@
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
     "@expo/downloader": "21.0.0",
-    "@expo/eas-build-job": "21.5.0",
+    "@expo/eas-build-job": "21.6.0",
     "@expo/env": "^0.4.0",
     "@expo/logger": "21.0.0",
     "@expo/package-manager": "1.9.10",
     "@expo/plist": "^0.3.5",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "21.5.0",
+    "@expo/steps": "21.6.0",
     "@expo/template-file": "21.0.2",
     "@expo/turtle-spawn": "21.0.0",
     "@expo/xcpretty": "^4.3.1",
@@ -100,5 +100,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "b27fe84a1ed87c96bebc2b341817bb520989b186"
+  "gitHead": "866febb1ba2a66e33859ae8a6c67bd845e8ce8a6"
 }

package/dist/steps/compositeFunctions.d.ts

@@ -1,11 +0,0 @@
-/**
- * Loads local function.yml files from the project and builds the catalog consumed by
- * {@link StepsConfigParser}. Keeps filesystem I/O in build-tools; expansion logic lives in @expo/steps.
- */
-import { bunyan } from '@expo/logger';
-import { CompositeFunctionCatalog, CompositeFunctionConfig, Step } from '@expo/eas-build-job';
-export declare function createCompositeFunctionLoader(projectRoot: string, logger?: bunyan): (compositeFunctionPath: string) => Promise<CompositeFunctionConfig>;
-export declare function buildCompositeFunctionCatalogAsync(projectRoot: string, { steps, logger }: {
-    steps: readonly Step[];
-    logger?: bunyan;
-}): Promise<CompositeFunctionCatalog>;

package/dist/steps/compositeFunctions.js

@@ -1,62 +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.createCompositeFunctionLoader = createCompositeFunctionLoader;
-exports.buildCompositeFunctionCatalogAsync = buildCompositeFunctionCatalogAsync;
-const eas_build_job_1 = require("@expo/eas-build-job");
-const steps_1 = require("@expo/steps");
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
-const yaml_1 = __importDefault(require("yaml"));
-const zod_1 = require("zod");
-async function loadLocalCompositeFunctionConfigAsync(projectRoot, compositeFunctionPath, { logger } = {}) {
-    const resolvedPath = (0, steps_1.resolveLocalCompositeFunctionPath)(projectRoot, compositeFunctionPath);
-    for (const ext of ['yml', 'yaml']) {
-        const absolutePath = path_1.default.join(resolvedPath, `function.${ext}`);
-        let rawContents;
-        try {
-            rawContents = await promises_1.default.readFile(absolutePath, 'utf-8');
-        }
-        catch (err) {
-            if (err?.code === 'ENOENT') {
-                continue;
-            }
-            throw new Error(`Failed to read local composite function "${compositeFunctionPath}" from ${absolutePath}`, {
-                cause: err,
-            });
-        }
-        let parsed;
-        try {
-            parsed = yaml_1.default.parse(rawContents);
-        }
-        catch (err) {
-            throw new Error(`Failed to parse local composite function "${compositeFunctionPath}" YAML at ${absolutePath}`, {
-                cause: err,
-            });
-        }
-        let config;
-        try {
-            config = eas_build_job_1.CompositeFunctionConfigZ.parse(parsed);
-        }
-        catch (err) {
-            if (err instanceof zod_1.ZodError) {
-                throw new Error(`Invalid composite function "${compositeFunctionPath}": ${zod_1.z.prettifyError(err)}`);
-            }
-            throw err;
-        }
-        logger?.debug(`Loaded local composite function "${compositeFunctionPath}" from ${path_1.default.relative(projectRoot, absolutePath)}`);
-        return config;
-    }
-    throw new Error(`Local composite function "${compositeFunctionPath}" was referenced by a step but no such composite function exists. A local composite function is resolved from a "function.yml" (or "function.yaml") file at the referenced path relative to the EAS project root (e.g. "uses: ${compositeFunctionPath}" resolves "${compositeFunctionPath}/function.yml"). The recommended convention is to keep composite functions under ".eas/functions/<name>".`);
-}
-function createCompositeFunctionLoader(projectRoot, logger) {
-    return compositeFunctionPath => loadLocalCompositeFunctionConfigAsync(projectRoot, compositeFunctionPath, { logger });
-}
-async function buildCompositeFunctionCatalogAsync(projectRoot, { steps, logger }) {
-    return (0, steps_1.buildCompositeFunctionCatalogFromStepsAsync)({
-        rootSteps: steps,
-        loadCompositeFunction: createCompositeFunctionLoader(projectRoot, logger),
-    });
-}