@expo/build-tools 18.7.0 → 18.8.0

package/dist/utils/easCli.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+async function probeEasdAsync() {
+    try {
+        const result = await (0, turtle_spawn_1.default)('easd', ['--help'], {
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        return result.status === 0;
+    }
+    catch {
+        return false;
+    }
+}
+async function resolveEasCommandPrefixAndEnvAsync() {
+    const npxArgsPrefix = (await (0, packageManager_1.isAtLeastNpm7Async)()) ? ['-y'] : [];
+    if (process.env.ENVIRONMENT === 'development') {
+        if (await probeEasdAsync()) {
+            return { cmd: 'easd', args: [], extraEnv: {} };
+        }
+        return {
+            cmd: 'npx',
+            args: [...npxArgsPrefix, `eas-cli@${eas_build_job_1.EasCliNpmTags.STAGING}`],
+            extraEnv: {},
+        };
+    }
+    else if (process.env.ENVIRONMENT === 'staging') {
+        return {
+            cmd: 'npx',
+            args: [...npxArgsPrefix, `eas-cli@${eas_build_job_1.EasCliNpmTags.STAGING}`],
+            extraEnv: { EXPO_STAGING: '1' },
+        };
+    }
+    else {
+        return {
+            cmd: 'npx',
+            args: [...npxArgsPrefix, `eas-cli@${eas_build_job_1.EasCliNpmTags.PRODUCTION}`],
+            extraEnv: {},
+        };
+    }
+}
+async function runEasCliCommand({ args, options, }) {
+    const { logger, ...spawnOptions } = options;
+    const { cmd, args: commandPrefixArgs, extraEnv } = await resolveEasCommandPrefixAndEnvAsync();
+    return await (0, turtle_spawn_1.default)(cmd, [...commandPrefixArgs, ...args], {
+        ...spawnOptions,
+        logger,
+        env: { ...spawnOptions.env, ...extraEnv },
+    });
+}

package/dist/utils/packageManager.d.ts

@@ -1,11 +1,14 @@
 import { type bunyan } from '@expo/logger';
+import { type BuildStepEnv } from '@expo/steps';
 export declare enum PackageManager {
     YARN = "yarn",
     NPM = "npm",
     PNPM = "pnpm",
     BUN = "bun"
 }
-export declare function resolvePackageManager(directory: string): PackageManager;
+export declare function resolvePackageManager(directory: string, { env }: {
+    env: BuildStepEnv;
+}): PackageManager;
 /**
  * Get the version of a package from the dist-tags.
  * Returns null if the version cannot be resolved.

package/dist/utils/packageManager.js

@@ -43,6 +43,7 @@ exports.findPackagerRootDir = findPackagerRootDir;
 exports.isAtLeastNpm7Async = isAtLeastNpm7Async;
 exports.shouldUseFrozenLockfile = shouldUseFrozenLockfile;
 exports.getPackageVersionFromPackageJson = getPackageVersionFromPackageJson;
+const eas_build_job_1 = require("@expo/eas-build-job");
 const PackageManagerUtils = __importStar(require("@expo/package-manager"));
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const semver_1 = __importDefault(require("semver"));
@@ -54,7 +55,7 @@ var PackageManager;
     PackageManager["PNPM"] = "pnpm";
     PackageManager["BUN"] = "bun";
 })(PackageManager || (exports.PackageManager = PackageManager = {}));
-function resolvePackageManager(directory) {
+function resolvePackageManager(directory, { env }) {
     try {
         const manager = PackageManagerUtils.resolvePackageManager(directory);
         if (manager === 'npm') {
@@ -66,13 +67,21 @@ function resolvePackageManager(directory) {
         else if (manager === 'bun') {
             return PackageManager.BUN;
         }
-        else {
+        else if (manager === 'yarn') {
             return PackageManager.YARN;
         }
     }
-    catch {
-        return PackageManager.YARN;
+    catch { }
+    const fallback = env.EAS_FALLBACK_PACKAGE_MANAGER;
+    if (fallback) {
+        const parsed = zod_1.z.enum(PackageManager).safeParse(fallback);
+        if (parsed.success) {
+            return parsed.data;
+        }
+        const allowed = Object.values(PackageManager).join(', ');
+        throw new eas_build_job_1.errors.UserError('EAS_INVALID_FALLBACK_PACKAGE_MANAGER', `Invalid EAS_FALLBACK_PACKAGE_MANAGER value "${fallback}" (expected one of: ${allowed}).`);
     }
+    return PackageManager.YARN;
 }
 /**
  * Get the version of a package from the dist-tags.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.7.0",
+  "version": "18.8.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": "18.5.0",
-    "@expo/eas-build-job": "18.6.0",
+    "@expo/eas-build-job": "18.8.0",
     "@expo/env": "^0.4.0",
     "@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.6.0",
+    "@expo/steps": "18.8.0",
     "@expo/template-file": "18.5.0",
     "@expo/turtle-spawn": "18.5.0",
     "@expo/xcpretty": "^4.3.1",
@@ -98,5 +98,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "7f163e3e529c71db2d394db4826ffff41313ae37"
+  "gitHead": "7c7fad4a13a8a45bdca698fc0fd4c08b17bb189c"
 }