Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(eas-cli): execute expo through a package manager to support isolated modules #2151

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −29
Draft

fix(eas-cli): execute expo through a package manager to support isolated modules #2151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 20 additions & 29 deletions packages/eas-cli/src/utils/expoCli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { ExpoConfig } from '@expo/config-types';
import spawnAsync from '@expo/spawn-async';
import { createForProject } from '@expo/package-manager';
import chalk from 'chalk';
import { boolish } from 'getenv';
import resolveFrom, { silent as silentResolveFrom } from 'resolve-from';
import resolveFrom from 'resolve-from';
import semver from 'semver';

import Log, { link } from '../log';
import Log from '../log';
import { memoize } from './expodash/memoize';

// Aggressively returns `true` (UNVERSIONED, invalid SDK version format) to push users towards the versioned CLI.
Expand Down Expand Up @@ -53,7 +53,7 @@ export function shouldUseVersionedExpoCLIExpensive(
}

// Finally ensure the CLI is available for sanity.
return !!resolveFrom.silent(projectDir, '@expo/cli');
return !!resolveFrom.silent(projectDir, 'expo');
}

/**
Expand All @@ -64,7 +64,8 @@ export function shouldUseVersionedExpoCLIExpensive(
export function shouldUseVersionedExpoCLIWithExplicitPlatformsExpensive(
projectDir: string
): boolean {
const expoCliPath = resolveFrom.silent(projectDir, '@expo/cli/package.json');
const expoPath = resolveFrom.silent(projectDir, 'expo');
const expoCliPath = expoPath && resolveFrom.silent(expoPath, '@expo/cli/package.json');
if (!expoCliPath) {
return false;
}
Expand All @@ -82,41 +83,31 @@ export async function expoCommandAsync(
args: string[],
{ silent = false }: { silent?: boolean } = {}
): Promise<void> {
let expoCliPath;
try {
expoCliPath =
silentResolveFrom(projectDir, 'expo/bin/cli') ?? resolveFrom(projectDir, 'expo/bin/cli.js');
} catch (e: any) {
if (e.code === 'MODULE_NOT_FOUND') {
throw new Error(
`The \`expo\` package was not found. Follow the installation directions at ${link(
'https://docs.expo.dev/bare/installing-expo-modules/'
)}`
);
}
throw e;
}

const spawnPromise = spawnAsync(expoCliPath, args, {
stdio: ['inherit', 'pipe', 'pipe'], // inherit stdin so user can install a missing expo-cli from inside this command
const packageManager = createForProject(projectDir, {
silent,
stdio: ['inherit', 'pipe', 'pipe'],
});
const {
child: { stdout, stderr },
} = spawnPromise;
if (!(stdout && stderr)) {

const commandPromise = packageManager.runAsync(['expo', ...args]);
const { child: spawnPromise } = commandPromise;

if (!spawnPromise.stdout || !spawnPromise.stderr) {
throw new Error('Failed to spawn expo-cli');
}

if (!silent) {
stdout.on('data', data => {
spawnPromise.stdout.on('data', data => {
for (const line of data.toString().trim().split('\n')) {
Log.log(`${chalk.gray('[expo-cli]')} ${line}`);
}
});
stderr.on('data', data => {

spawnPromise.stderr.on('data', data => {
for (const line of data.toString().trim().split('\n')) {
Log.warn(`${chalk.gray('[expo-cli]')} ${line}`);
}
});
}
await spawnPromise;

await commandPromise;
}
Loading