eas-cli 18.13.0 → 18.13.1

package/build/build/metadata.js

@@ -5,6 +5,7 @@ exports.getReactNativeVersionAsync = getReactNativeVersionAsync;
 exports.truncateGitCommitMessage = truncateGitCommitMessage;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
+const results_1 = require("@expo/results");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
 const version_1 = require("./android/version");
@@ -20,6 +21,14 @@ const User_1 = require("../user/User");
 async function collectMetadataAsync(ctx, runtimeAndFingerprintMetadata) {
     const channelObject = await resolveChannelAsync(ctx);
     const distribution = ctx.buildProfile.distribution ?? types_1.BuildDistributionType.STORE;
+    const expoPackageVersionResult = await (0, results_1.asyncResult)((0, eas_build_job_1.getInstalledExpoPackageVersionAsync)({
+        env: process.env,
+        projectDir: ctx.projectDir,
+    }));
+    if (!expoPackageVersionResult.ok) {
+        log_1.default.debug('Failed to resolve expo package version:');
+        log_1.default.debug(expoPackageVersionResult.reason);
+    }
     const metadata = {
         trackingContext: ctx.analyticsEventProperties,
         ...(await maybeResolveVersionsAsync(ctx)),
@@ -30,6 +39,7 @@ async function collectMetadataAsync(ctx, runtimeAndFingerprintMetadata) {
         runtimeVersion: runtimeAndFingerprintMetadata?.runtimeVersion,
         fingerprintHash: runtimeAndFingerprintMetadata?.fingerprintHash,
         reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
+        expoPackageVersion: expoPackageVersionResult.value,
         ...channelObject,
         distribution,
         appName: ctx.exp.name,

package/build/commandUtils/new/commands.js

@@ -12,6 +12,7 @@ const git_1 = require("../../onboarding/git");
 const installDependencies_1 = require("../../onboarding/installDependencies");
 const runCommand_1 = require("../../onboarding/runCommand");
 const ora_1 = require("../../ora");
+const expoCli_1 = require("../../utils/expoCli");
 async function cloneTemplateAsync(targetProjectDir) {
     const githubUsername = 'expo';
     const githubRepositoryName = 'expo-template-default';
@@ -40,16 +41,8 @@ async function installProjectDependenciesAsync(projectDir, packageManager) {
         packageManager,
     });
     const dependencies = ['expo-updates', '@expo/metro-runtime'];
-    for (const dependency of dependencies) {
-        spinner.text = `Installing ${chalk_1.default.bold(dependency)}`;
-        await (0, runCommand_1.runCommandAsync)({
-            cwd: projectDir,
-            command: 'npx',
-            args: ['expo', 'install', dependency],
-            showOutput: false,
-            showSpinner: false,
-        });
-    }
+    spinner.text = `Installing ${dependencies.map(dep => chalk_1.default.bold(dep)).join(', ')}`;
+    await (0, expoCli_1.expoCommandAsync)(projectDir, ['install', ...dependencies], { silent: true });
     spinner.succeed(`Installed project dependencies`);
 }
 async function initializeGitRepositoryAsync(projectDir) {

package/build/commands/project/onboarding.js

@@ -24,6 +24,7 @@ const platform_1 = require("../../platform");
 const expoConfig_1 = require("../../project/expoConfig");
 const prompts_1 = require("../../prompts");
 const easCli_1 = require("../../utils/easCli");
+const expoCli_1 = require("../../utils/expoCli");
 const git_2 = tslib_1.__importDefault(require("../../vcs/clients/git"));
 class Onboarding extends EasCommand_1.default {
     static aliases = ['init:onboarding', 'onboarding'];
@@ -146,23 +147,12 @@ class Onboarding extends EasCommand_1.default {
             actor,
         });
         if (!app.githubRepository) {
-            await (0, runCommand_1.runCommandAsync)({
-                cwd: finalTargetProjectDirectory,
-                command: 'npx',
-                args: ['expo', 'install', 'expo-updates'],
-            });
-            log_1.default.log();
-            await (0, runCommand_1.runCommandAsync)({
-                cwd: finalTargetProjectDirectory,
-                command: 'npx',
-                args: ['expo', 'install', 'expo-insights'],
-            });
-            log_1.default.log();
-            await (0, runCommand_1.runCommandAsync)({
-                cwd: finalTargetProjectDirectory,
-                command: 'npx',
-                args: ['expo', 'install', 'expo-dev-client'],
-            });
+            await (0, expoCli_1.expoCommandAsync)(finalTargetProjectDirectory, [
+                'install',
+                'expo-updates',
+                'expo-insights',
+                'expo-dev-client',
+            ]);
             log_1.default.log();
         }
         await vcsClient.trackFileAsync('package-lock.json');

package/build/log.js

@@ -4,12 +4,12 @@ exports.link = link;
 exports.learnMore = learnMore;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
 const figures_1 = tslib_1.__importDefault(require("figures"));
 const getenv_1 = require("getenv");
 const log_symbols_1 = tslib_1.__importDefault(require("log-symbols"));
 const terminal_link_1 = tslib_1.__importDefault(require("terminal-link"));
-// eslint-disable-next-line eslint-import/no-extraneous-dependencies
-const nodeDebug = require('debug')('eas:log:debug');
+const nodeDebug = (0, debug_1.default)('eas:log:debug');
 class Log {
     static isDebug = (0, getenv_1.boolish)('EXPO_DEBUG', false);
     static log(...args) {
@@ -43,7 +43,8 @@ class Log {
         }
         else {
             Log.updateIsLastLineNewLine(args);
-            nodeDebug(...args);
+            const [first, ...rest] = args;
+            nodeDebug(first, ...rest);
         }
     }
     static gray(...args) {

package/build/project/expoConfig.js

@@ -7,12 +7,11 @@ exports.isUsingStaticExpoConfig = isUsingStaticExpoConfig;
 exports.getPublicExpoConfigAsync = getPublicExpoConfigAsync;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
-const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const joi_1 = tslib_1.__importDefault(require("joi"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const projectUtils_1 = require("./projectUtils");
-const log_1 = tslib_1.__importDefault(require("../log"));
+const expoCli_1 = require("../utils/expoCli");
 async function createOrModifyExpoConfigAsync(projectDir, exp, readOptions) {
     ensureExpoConfigExists(projectDir);
     if (readOptions) {
@@ -22,7 +21,6 @@ async function createOrModifyExpoConfigAsync(projectDir, exp, readOptions) {
         return await (0, config_1.modifyConfigAsync)(projectDir, exp);
     }
 }
-let wasExpoConfigWarnPrinted = false;
 async function getExpoConfigInternalAsync(projectDir, opts = {}) {
     const originalProcessEnv = process.env;
     try {
@@ -32,29 +30,12 @@ async function getExpoConfigInternalAsync(projectDir, opts = {}) {
         };
         let exp;
         if ((0, projectUtils_1.isExpoInstalled)(projectDir)) {
-            try {
-                const { stdout } = await (0, spawn_async_1.default)('npx', ['expo', 'config', '--json', ...(opts.isPublicConfig ? ['--type', 'public'] : [])], {
-                    cwd: projectDir,
-                    env: {
-                        ...process.env,
-                        ...opts.env,
-                        EXPO_NO_DOTENV: '1',
-                    },
-                });
-                exp = JSON.parse(stdout);
-            }
-            catch (err) {
-                if (!wasExpoConfigWarnPrinted) {
-                    log_1.default.warn(`Failed to read the app config from the project using "npx expo config" command: ${err.message}.`);
-                    log_1.default.warn('Falling back to the version of "@expo/config" shipped with the EAS CLI.');
-                    wasExpoConfigWarnPrinted = true;
-                }
-                exp = (0, config_1.getConfig)(projectDir, {
-                    skipSDKVersionRequirement: true,
-                    ...(opts.isPublicConfig ? { isPublicConfig: true } : {}),
-                    ...(opts.skipPlugins ? { skipPlugins: true } : {}),
-                }).exp;
-            }
+            const { stdout } = await (0, expoCli_1.spawnExpoCommand)(projectDir, ['config', '--json', ...(opts.isPublicConfig ? ['--type', 'public'] : [])], {
+                env: {
+                    EXPO_NO_DOTENV: '1',
+                },
+            });
+            exp = JSON.parse(stdout);
         }
         else {
             exp = (0, config_1.getConfig)(projectDir, {

package/build/project/ios/entitlements.d.ts

@@ -1,9 +1,8 @@
 import { JSONObject } from '@expo/json-file';
-import { Client } from '../../vcs/vcs';
 interface Target {
     buildConfiguration?: string;
     targetName: string;
 }
-export declare function getManagedApplicationTargetEntitlementsAsync(projectDir: string, env: Record<string, string>, vcsClient: Client): Promise<JSONObject>;
+export declare function getManagedApplicationTargetEntitlementsAsync(projectDir: string, env: Record<string, string>): Promise<JSONObject>;
 export declare function getNativeTargetEntitlementsAsync(projectDir: string, target: Target): Promise<JSONObject | null>;
 export {};

package/build/project/ios/entitlements.js

@@ -2,52 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getManagedApplicationTargetEntitlementsAsync = getManagedApplicationTargetEntitlementsAsync;
 exports.getNativeTargetEntitlementsAsync = getNativeTargetEntitlementsAsync;
-const tslib_1 = require("tslib");
 const config_plugins_1 = require("@expo/config-plugins");
-const prebuild_config_1 = require("@expo/prebuild-config");
-const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
-const log_1 = tslib_1.__importDefault(require("../../log"));
+const expoCli_1 = require("../../utils/expoCli");
 const plist_1 = require("../../utils/plist");
-const workflow_1 = require("../workflow");
-let wasExpoConfigPluginsWarnPrinted = false;
-async function getManagedApplicationTargetEntitlementsAsync(projectDir, env, vcsClient) {
-    const originalProcessEnv = process.env;
-    try {
-        process.env = {
-            ...process.env,
-            ...env,
-        };
-        let expWithMods;
-        try {
-            const { stdout } = await (0, spawn_async_1.default)('npx', ['expo', 'config', '--json', '--type', 'introspect'], {
-                cwd: projectDir,
-                env: {
-                    ...process.env,
-                    ...env,
-                    EXPO_NO_DOTENV: '1',
-                },
-            });
-            expWithMods = JSON.parse(stdout);
-        }
-        catch (err) {
-            if (!wasExpoConfigPluginsWarnPrinted) {
-                log_1.default.warn(`Failed to read the app config from the project using "npx expo config" command: ${err.message}.`);
-                log_1.default.warn('Falling back to the version of "@expo/config" shipped with the EAS CLI.');
-                wasExpoConfigPluginsWarnPrinted = true;
-            }
-            const { exp } = await (0, prebuild_config_1.getPrebuildConfigAsync)(projectDir, { platforms: ['ios'] });
-            expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
-                projectRoot: projectDir,
-                platforms: ['ios'],
-                introspect: true,
-                ignoreExistingNativeFiles: await (0, workflow_1.hasIgnoredIosProjectAsync)(projectDir, vcsClient),
-            });
-        }
-        return expWithMods.ios?.entitlements ?? {};
-    }
-    finally {
-        process.env = originalProcessEnv;
-    }
+async function getManagedApplicationTargetEntitlementsAsync(projectDir, env) {
+    const { stdout } = await (0, expoCli_1.spawnExpoCommand)(projectDir, ['config', '--json', '--type', 'introspect'], {
+        env,
+    });
+    const expWithMods = JSON.parse(stdout);
+    return expWithMods.ios?.entitlements ?? {};
 }
 async function getNativeTargetEntitlementsAsync(projectDir, target) {
     const entitlementsPath = config_plugins_1.IOSConfig.Entitlements.getEntitlementsPath(projectDir, target);

package/build/project/ios/target.js

@@ -29,7 +29,7 @@ async function resolveManagedProjectTargetsAsync({ exp, projectDir, xcodeBuildCo
         targetName: applicationTargetName,
         buildConfiguration,
     });
-    const applicationTargetEntitlements = await (0, entitlements_1.getManagedApplicationTargetEntitlementsAsync)(projectDir, env ?? {}, vcsClient);
+    const applicationTargetEntitlements = await (0, entitlements_1.getManagedApplicationTargetEntitlementsAsync)(projectDir, env ?? {});
     const appExtensions = exp.extra?.eas?.build?.experimental?.ios?.appExtensions ?? [];
     const { error } = AppExtensionsConfigSchema.validate(appExtensions, {
         allowUnknown: false,

package/build/utils/expoCli.d.ts

@@ -1,4 +1,6 @@
 import { ExpoConfig } from '@expo/config';
+import spawnAsync from '@expo/spawn-async';
+import type { CommonSpawnOptions } from 'node:child_process';
 /**
  * @returns `true` if the project is SDK +46, has `@expo/cli`, and `EXPO_USE_LOCAL_CLI` is not set to a _false_ value.
  */
@@ -11,6 +13,7 @@ export declare function shouldUseVersionedExpoCLIExpensive(projectDir: string, e
 export declare function shouldUseVersionedExpoCLIWithExplicitPlatformsExpensive(projectDir: string): boolean;
 export declare const shouldUseVersionedExpoCLI: typeof shouldUseVersionedExpoCLIExpensive;
 export declare const shouldUseVersionedExpoCLIWithExplicitPlatforms: typeof shouldUseVersionedExpoCLIWithExplicitPlatformsExpensive;
+export declare function spawnExpoCommand(projectDir: string, args: string[], opts?: CommonSpawnOptions): spawnAsync.SpawnPromise<spawnAsync.SpawnResult>;
 export declare function expoCommandAsync(projectDir: string, args: string[], { silent, extraEnv, }?: {
     silent?: boolean;
     extraEnv?: Record<string, string | undefined>;

package/build/utils/expoCli.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.shouldUseVersionedExpoCLIWithExplicitPlatforms = exports.shouldUseVersionedExpoCLI = void 0;
 exports.shouldUseVersionedExpoCLIExpensive = shouldUseVersionedExpoCLIExpensive;
 exports.shouldUseVersionedExpoCLIWithExplicitPlatformsExpensive = shouldUseVersionedExpoCLIWithExplicitPlatformsExpensive;
+exports.spawnExpoCommand = spawnExpoCommand;
 exports.expoCommandAsync = expoCommandAsync;
 const tslib_1 = require("tslib");
 const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
@@ -66,7 +67,7 @@ function shouldUseVersionedExpoCLIWithExplicitPlatformsExpensive(projectDir) {
 }
 exports.shouldUseVersionedExpoCLI = (0, memoize_1.memoize)(shouldUseVersionedExpoCLIExpensive);
 exports.shouldUseVersionedExpoCLIWithExplicitPlatforms = (0, memoize_1.memoize)(shouldUseVersionedExpoCLIWithExplicitPlatformsExpensive);
-async function expoCommandAsync(projectDir, args, { silent = false, extraEnv = {}, } = {}) {
+function spawnExpoCommand(projectDir, args, opts) {
     let expoCliPath;
     try {
         expoCliPath =
@@ -79,23 +80,30 @@ async function expoCommandAsync(projectDir, args, { silent = false, extraEnv = {
         throw e;
     }
     const spawnPromise = (0, spawn_async_1.default)(expoCliPath, args, {
-        stdio: ['inherit', 'pipe', 'pipe'], // inherit stdin so user can install a missing expo-cli from inside this command
+        cwd: projectDir,
+        ...opts,
         env: {
             ...process.env,
-            ...extraEnv,
+            ...opts?.env,
         },
     });
-    const { child: { stdout, stderr }, } = spawnPromise;
-    if (!(stdout && stderr)) {
+    if (!spawnPromise.child.stdout && !spawnPromise.child.stderr) {
         throw new Error('Failed to spawn expo-cli');
     }
+    return spawnPromise;
+}
+async function expoCommandAsync(projectDir, args, { silent = false, extraEnv = {}, } = {}) {
+    const spawnPromise = spawnExpoCommand(projectDir, args, {
+        stdio: ['inherit', 'pipe', 'pipe'], // inherit stdin so user can install a missing expo-cli from inside this command
+        env: extraEnv,
+    });
     if (!silent) {
-        stdout.on('data', data => {
+        spawnPromise.child.stdout?.on('data', data => {
             for (const line of data.toString().trim().split('\n')) {
                 log_1.default.log(`${chalk_1.default.gray('[expo-cli]')} ${line}`);
             }
         });
-        stderr.on('data', data => {
+        spawnPromise.child.stderr?.on('data', data => {
             for (const line of data.toString().trim().split('\n')) {
                 log_1.default.warn(`${chalk_1.default.gray('[expo-cli]')} ${line}`);
             }