address review

Author: vonovak

packages/eas-cli/src/build/runBuildAndSubmit.ts

@@ -49,7 +49,7 @@ import {
   CustomBuildConfigMetadata,
   validateCustomBuildConfigAsync,
 } from '../project/customBuildConfig';
-import { discourageExpoGoForProd } from '../project/discourageExpoGoForProd';
+import { discourageExpoGoForProdAsync } from '../project/discourageExpoGoForProd';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
 import {
@@ -147,7 +147,7 @@ export async function runBuildAndSubmitAsync({
     projectDir,
   });
 
-  discourageExpoGoForProd(buildProfiles, projectDir, vcsClient);
+  await discourageExpoGoForProdAsync(buildProfiles, projectDir, vcsClient);
 
   for (const buildProfile of buildProfiles) {
     if (buildProfile.profile.image && ['default', 'stable'].includes(buildProfile.profile.image)) {

packages/eas-cli/src/build/utils/devClient.ts

@@ -24,7 +24,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   nonInteractive?: boolean;
   buildProfiles?: ProfileData<'build'>[];
 }): Promise<void> {
-  if (await isExpoDevClientInstalledAsync(projectDir)) {
+  if (isExpoDevClientInstalled(projectDir)) {
     return;
   }
 
@@ -103,7 +103,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   }
 }
 
-async function isExpoDevClientInstalledAsync(projectDir: string): Promise<boolean> {
+export function isExpoDevClientInstalled(projectDir: string): boolean {
   try {
     resolveFrom(projectDir, 'expo-dev-client/package.json');
     return true;

packages/eas-cli/src/project/__tests__/discourageExpoGoForProd-test.ts

@@ -4,7 +4,7 @@ import resolveFrom from 'resolve-from';
 
 import type { ProfileData } from '../../utils/profiles';
 import { resolveVcsClient } from '../../vcs';
-import { detectExpoGoProdBuildAsync } from '../discourageExpoGoForProd';
+import { detectExpoGoProdBuildAsync } from '../discourageExpoGoForProdAsync';
 
 jest.mock('getenv');
 jest.mock('resolve-from');
@@ -29,7 +29,10 @@ describe(detectExpoGoProdBuildAsync, () => {
   beforeEach(() => {
     jest.clearAllMocks();
     jest.mocked(getenv.boolish).mockReturnValue(false);
-    jest.mocked(resolveFrom.silent).mockReturnValue(undefined); // expo-dev-client is not installed
+    jest.mocked(resolveFrom).mockImplementation(() => {
+      // expo-dev-client is not installed
+      throw new Error('Module not found');
+    });
   });
 
   describe('should return false', () => {
@@ -45,7 +48,7 @@ describe(detectExpoGoProdBuildAsync, () => {
     });
 
     it('when expo-dev-client is installed - that signals a development build', async () => {
-      jest.mocked(resolveFrom.silent).mockReturnValue('/path/to/expo-dev-client/package.json');
+      jest.mocked(resolveFrom).mockReturnValue('/path/to/expo-dev-client/package.json');
       const buildProfiles = [createMockBuildProfile('production')];
 
       const result = await detectExpoGoProdBuildAsync(buildProfiles, projectDir, vcsClient);

packages/eas-cli/src/project/discourageExpoGoForProd.ts

@@ -1,43 +1,47 @@
 import { Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import getenv from 'getenv';
-import resolveFrom from 'resolve-from';
 
 import { resolveWorkflowPerPlatformAsync } from './workflow';
+import { isExpoDevClientInstalled } from '../build/utils/devClient';
 import Log, { learnMore } from '../log';
 import type { ProfileData } from '../utils/profiles';
 import type { Client } from '../vcs/vcs';
 
 const suppressionEnvVarName = 'EAS_BUILD_NO_EXPO_GO_WARNING';
 
-export const discourageExpoGoForProd = (
+export async function discourageExpoGoForProdAsync(
   buildProfiles: ProfileData<'build'>[] | undefined,
   projectDir: string,
   vcsClient: Client
-): void => {
-  detectExpoGoProdBuildAsync(buildProfiles, projectDir, vcsClient)
-    .then(usesExpoGo => {
-      if (usesExpoGo) {
-        Log.newLine();
-        Log.warn(
-          `⚠️ It appears you're trying to build an app based on Expo Go for production. Expo Go is not a suitable environment for production apps.`
-        );
-        Log.warn(
-          learnMore('https://docs.expo.dev/develop/development-builds/expo-go-to-dev-build/', {
-            learnMoreMessage: 'Learn more about converting from Expo Go to a development build',
-            dim: false,
-          })
-        );
-        Log.warn(
-          chalk.dim(`To suppress this warning, set ${chalk.bold(`${suppressionEnvVarName}=true`)}.`)
-        );
-        Log.newLine();
-      }
-    })
-    .catch(err => {
-      Log.warn('Error detecting whether Expo Go is used:', err);
-    });
-};
+): Promise<void> {
+  try {
+    const isExpoGoProdBuild = await detectExpoGoProdBuildAsync(
+      buildProfiles,
+      projectDir,
+      vcsClient
+    );
+    if (!isExpoGoProdBuild) {
+      return;
+    }
+    Log.newLine();
+    Log.warn(
+      `⚠️ It appears you're trying to build an app based on Expo Go for production. Expo Go is not a suitable environment for production apps.`
+    );
+    Log.warn(
+      learnMore('https://docs.expo.dev/develop/development-builds/expo-go-to-dev-build/', {
+        learnMoreMessage: 'Learn more about converting from Expo Go to a development build',
+        dim: false,
+      })
+    );
+    Log.warn(
+      chalk.dim(`To suppress this warning, set ${chalk.bold(`${suppressionEnvVarName}=true`)}.`)
+    );
+    Log.newLine();
+  } catch (err) {
+    Log.warn('Error detecting whether Expo Go is used:', err);
+  }
+}
 
 export async function detectExpoGoProdBuildAsync(
   buildProfiles: ProfileData<'build'>[] | undefined,
@@ -51,7 +55,7 @@ export async function detectExpoGoProdBuildAsync(
     return false;
   }
 
-  const hasExpoDevClient = checkIfExpoDevClientInstalled(projectDir);
+  const hasExpoDevClient = isExpoDevClientInstalled(projectDir);
   if (hasExpoDevClient) {
     return false;
   }
@@ -67,7 +71,3 @@ async function checkIfManagedWorkflowAsync(
 
   return workflows.android === Workflow.MANAGED && workflows.ios === Workflow.MANAGED;
 }
-
-function checkIfExpoDevClientInstalled(projectDir: string): boolean {
-  return resolveFrom.silent(projectDir, 'expo-dev-client/package.json') !== undefined;
-}