@expo/build-tools 18.6.0 → 18.7.0

package/dist/common/setup.js

@@ -65,10 +65,7 @@ async function setupAsync(ctx) {
         }
     });
     const packageJson = await ctx.runBuildPhase(eas_build_job_1.BuildPhase.READ_PACKAGE_JSON, async () => {
-        ctx.logger.info('Using package.json:');
-        const packageJson = (0, project_1.readPackageJson)(ctx.getReactNativeProjectDirectory());
-        ctx.logger.info(JSON.stringify(packageJson, null, 2));
-        return packageJson;
+        return (0, project_1.readAndLogPackageJson)(ctx.logger, ctx.getReactNativeProjectDirectory());
     });
     await ctx.runBuildPhase(eas_build_job_1.BuildPhase.INSTALL_DEPENDENCIES, async () => {
         const expoVersion = ctx.metadata?.sdkVersion ??

package/dist/steps/easFunctions.js

@@ -19,7 +19,9 @@ const installMaestro_1 = require("./functions/installMaestro");
 const installNodeModules_1 = require("./functions/installNodeModules");
 const installPods_1 = require("./functions/installPods");
 const prebuild_1 = require("./functions/prebuild");
+const readAppConfig_1 = require("./functions/readAppConfig");
 const readIpaInfo_1 = require("./functions/readIpaInfo");
+const readPackageJson_1 = require("./functions/readPackageJson");
 const repack_1 = require("./functions/repack");
 const reportMaestroTestResults_1 = require("./functions/reportMaestroTestResults");
 const resolveAppleTeamIdFromCredentials_1 = require("./functions/resolveAppleTeamIdFromCredentials");
@@ -43,6 +45,8 @@ function getEasFunctions(ctx) {
         (0, downloadArtifact_1.createDownloadArtifactFunction)(),
         (0, uploadArtifact_1.createUploadArtifactBuildFunction)(ctx),
         (0, useNpmToken_1.createSetUpNpmrcBuildFunction)(),
+        (0, readPackageJson_1.createReadPackageJsonBuildFunction)(),
+        (0, readAppConfig_1.createReadAppConfigBuildFunction)(),
         (0, installNodeModules_1.createInstallNodeModulesBuildFunction)(),
         (0, prebuild_1.createPrebuildBuildFunction)(),
         (0, readIpaInfo_1.createReadIpaInfoBuildFunction)(),

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

@@ -0,0 +1,2 @@
+import { BuildFunction } from '@expo/steps';
+export declare function createReadAppConfigBuildFunction(): BuildFunction;

package/dist/steps/functions/readAppConfig.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createReadAppConfigBuildFunction = createReadAppConfigBuildFunction;
+const steps_1 = require("@expo/steps");
+const appConfig_1 = require("../../utils/appConfig");
+function createReadAppConfigBuildFunction() {
+    return new steps_1.BuildFunction({
+        namespace: 'eas',
+        id: 'read_app_config',
+        name: 'Read app config',
+        __metricsId: 'eas/read_app_config',
+        outputProviders: [
+            steps_1.BuildStepOutput.createProvider({
+                id: 'app_config',
+                required: false,
+            }),
+        ],
+        fn: async (stepCtx, { env, outputs }) => {
+            const metadata = stepCtx.global.staticContext.metadata;
+            try {
+                const appConfig = (await (0, appConfig_1.readAppConfig)({
+                    projectDir: stepCtx.workingDirectory,
+                    env: Object.keys(env).reduce((acc, key) => {
+                        acc[key] = env[key] ?? '';
+                        return acc;
+                    }, {}),
+                    logger: stepCtx.logger,
+                    sdkVersion: metadata?.sdkVersion,
+                })).exp;
+                stepCtx.logger.info('Using app configuration:');
+                stepCtx.logger.info(JSON.stringify(appConfig, null, 2));
+                outputs.app_config.set(JSON.stringify(appConfig));
+            }
+            catch {
+                // readAppConfig logs underlying failures.
+            }
+        },
+    });
+}

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

@@ -0,0 +1,2 @@
+import { BuildFunction } from '@expo/steps';
+export declare function createReadPackageJsonBuildFunction(): BuildFunction;

package/dist/steps/functions/readPackageJson.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createReadPackageJsonBuildFunction = createReadPackageJsonBuildFunction;
+const steps_1 = require("@expo/steps");
+const project_1 = require("../../utils/project");
+function createReadPackageJsonBuildFunction() {
+    return new steps_1.BuildFunction({
+        namespace: 'eas',
+        id: 'read_package_json',
+        name: 'Read package.json',
+        __metricsId: 'eas/read_package_json',
+        outputProviders: [
+            steps_1.BuildStepOutput.createProvider({
+                id: 'package_json',
+                required: false,
+            }),
+        ],
+        fn: async (stepCtx, { outputs }) => {
+            try {
+                const packageJson = (0, project_1.readAndLogPackageJson)(stepCtx.logger, stepCtx.workingDirectory);
+                outputs.package_json.set(JSON.stringify(packageJson));
+            }
+            catch (err) {
+                stepCtx.logger.error({ err });
+            }
+        },
+    });
+}

package/dist/steps/functions/startAndroidEmulator.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartAndroidEmulatorBuildFunction = createStartAndroidEmulatorBuildFunction;
+const eas_build_job_1 = require("@expo/eas-build-job");
 const results_1 = require("@expo/results");
 const steps_1 = require("@expo/steps");
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
@@ -43,6 +44,12 @@ function createStartAndroidEmulatorBuildFunction() {
             }),
         ],
         fn: async ({ logger }, { inputs, env }) => {
+            if (env.EAS_NO_EMULATOR_HOST_SUPPORT_CHECK !== '1') {
+                await assertAndroidEmulatorHostSupportAsync({ env });
+            }
+            else {
+                logger.info('Skipping Android emulator host support check because $EAS_NO_EMULATOR_HOST_SUPPORT_CHECK is enabled.');
+            }
             try {
                 const availableDevices = await AndroidEmulatorUtils_1.AndroidEmulatorUtils.getAvailableDevicesAsync({ env });
                 logger.info(`Available Android devices:\n- ${availableDevices.join(`\n- `)}`);
@@ -229,3 +236,24 @@ function createStartAndroidEmulatorBuildFunction() {
         },
     });
 }
+async function assertAndroidEmulatorHostSupportAsync({ env, }) {
+    const isAndroidEmulatorHostSupported = await isAndroidEmulatorHostSupportedAsync(env);
+    if (!isAndroidEmulatorHostSupported) {
+        throw new eas_build_job_1.UserError('ANDROID_EMULATOR_ACCEL_CHECK_UNAVAILABLE', 'Could not start the Android emulator on this runner.\n\n' +
+            'Android emulator requires nested virtualization on Linux. This job does not have the required virtualization support.\n\n' +
+            'Update your workflow YAML to use a nested-virtualization Linux runner, for example:\n' +
+            '  runs_on: linux-medium-nested-virtualization\n' +
+            '  runs_on: linux-large-nested-virtualization\n\n' +
+            'See https://docs.expo.dev/eas/workflows/syntax/#jobsjob_idruns_on for more information.');
+    }
+}
+async function isAndroidEmulatorHostSupportedAsync(env) {
+    const androidSdkPath = env.ANDROID_HOME ?? env.ANDROID_SDK_ROOT ?? '';
+    try {
+        await (0, turtle_spawn_1.default)(`${androidSdkPath}/emulator/emulator`, ['-accel-check'], { env });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/utils/project.d.ts

@@ -11,4 +11,7 @@ export declare function runExpoCliCommand({ packageManager, args, options, }: {
     options: SpawnOptions;
 }): SpawnPromise<SpawnResult>;
 export declare function readPackageJson(projectDir: string): any;
+export declare function readAndLogPackageJson(logger: {
+    info: (message: string) => void;
+}, projectDir: string): any;
 export declare function readEasJsonContents(projectDir: string): string;

package/dist/utils/project.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isUsingModernYarnVersion = isUsingModernYarnVersion;
 exports.runExpoCliCommand = runExpoCliCommand;
 exports.readPackageJson = readPackageJson;
+exports.readAndLogPackageJson = readAndLogPackageJson;
 exports.readEasJsonContents = readEasJsonContents;
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -76,6 +77,12 @@ function readPackageJson(projectDir) {
         throw new Error(`Failed to parse or read package.json: ${err.message}`);
     }
 }
+function readAndLogPackageJson(logger, projectDir) {
+    logger.info('Using package.json:');
+    const packageJson = readPackageJson(projectDir);
+    logger.info(JSON.stringify(packageJson, null, 2));
+    return packageJson;
+}
 function readEasJsonContents(projectDir) {
     const easJsonPath = path_1.default.join(projectDir, 'eas.json');
     if (!fs_extra_1.default.pathExistsSync(easJsonPath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.6.0",
+  "version": "18.7.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -98,5 +98,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "0fb6dfc334f0e496d701ff2afad0d15da9a83478"
+  "gitHead": "7f163e3e529c71db2d394db4826ffff41313ae37"
 }