fix expo resolve

Author: sunnylqm

src/bundle-runner.ts

@@ -32,6 +32,90 @@ interface GradleConfig {
   enableHermes?: boolean;
 }
 
+const dependencyFields = [
+  'dependencies',
+  'devDependencies',
+  'peerDependencies',
+  'optionalDependencies',
+] as const;
+
+type ResolvedExpoCli = {
+  cliPath: string;
+  usingExpo: boolean;
+};
+
+export function hasProjectDependency(
+  dependencyName: string,
+  projectRoot = process.cwd(),
+): boolean {
+  try {
+    const packageJson = JSON.parse(
+      fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8'),
+    ) as Record<string, unknown>;
+
+    return dependencyFields.some((field) => {
+      const dependencies = packageJson[field];
+      if (typeof dependencies !== 'object' || dependencies === null) {
+        return false;
+      }
+      return dependencyName in dependencies;
+    });
+  } catch {
+    return false;
+  }
+}
+
+export function resolveExpoCli(projectRoot = process.cwd()): ResolvedExpoCli {
+  if (!hasProjectDependency('expo', projectRoot)) {
+    return {
+      cliPath: '',
+      usingExpo: false,
+    };
+  }
+
+  try {
+    const searchPaths = [projectRoot];
+
+    try {
+      const expoPackageJsonPath = require.resolve('expo/package.json', {
+        paths: [projectRoot],
+      });
+      searchPaths.push(path.dirname(expoPackageJsonPath));
+    } catch {
+      // expo 包不存在，忽略
+    }
+
+    const cliPath = require.resolve('@expo/cli', {
+      paths: searchPaths,
+    });
+    const expoCliVersion = JSON.parse(
+      fs.readFileSync(
+        require.resolve('@expo/cli/package.json', {
+          paths: searchPaths,
+        }),
+        'utf8',
+      ),
+    ).version;
+
+    if (!satisfies(expoCliVersion, '>= 0.10.17')) {
+      return {
+        cliPath: '',
+        usingExpo: false,
+      };
+    }
+
+    return {
+      cliPath,
+      usingExpo: true,
+    };
+  } catch {
+    return {
+      cliPath: '',
+      usingExpo: false,
+    };
+  }
+}
+
 export async function runReactNativeBundleCommand({
   bundleName,
   dev,
@@ -65,40 +149,9 @@ export async function runReactNativeBundleCommand({
   let usingExpo = false;
 
   const getExpoCli = () => {
-    try {
-      const searchPaths = [process.cwd()];
-
-      try {
-        const expoPath = require.resolve('expo/package.json', {
-          paths: [process.cwd()],
-        });
-        const expoDir = expoPath.replace(/\/package\.json$/, '');
-        searchPaths.push(expoDir);
-      } catch {
-        // expo 包不存在，忽略
-      }
-
-      cliPath = require.resolve('@expo/cli', {
-        paths: searchPaths,
-      });
-
-      const expoCliVersion = JSON.parse(
-        fs
-          .readFileSync(
-            require.resolve('@expo/cli/package.json', {
-              paths: searchPaths,
-            }),
-          )
-          .toString(),
-      ).version;
-      if (satisfies(expoCliVersion, '>= 0.10.17')) {
-        usingExpo = true;
-      } else {
-        cliPath = '';
-      }
-    } catch {
-      // fallback 到 RN CLI
-    }
+    const resolvedExpoCli = resolveExpoCli();
+    cliPath = resolvedExpoCli.cliPath;
+    usingExpo = resolvedExpoCli.usingExpo;
   };
 
   const getRnCli = () => {

tests/bundle-runner.test.ts

@@ -0,0 +1,86 @@
+import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { resolveExpoCli } from '../src/bundle-runner';
+
+function mkTempDir(prefix: string): string {
+  return fs.mkdtempSync(path.join(os.tmpdir(), prefix));
+}
+
+function writeJson(filePath: string, value: unknown): void {
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, JSON.stringify(value, null, 2));
+}
+
+function writeFile(filePath: string, content = ''): void {
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, content);
+}
+
+describe('bundle-runner expo cli detection', () => {
+  let originalCwd = '';
+  let tempRoot = '';
+
+  beforeEach(() => {
+    originalCwd = process.cwd();
+    tempRoot = mkTempDir('rn-update-bundle-runner-');
+  });
+
+  afterEach(() => {
+    process.chdir(originalCwd);
+    if (tempRoot && fs.existsSync(tempRoot)) {
+      fs.rmSync(tempRoot, { recursive: true, force: true });
+    }
+  });
+
+  test('skips expo cli when project package.json does not depend on expo', () => {
+    writeJson(path.join(tempRoot, 'package.json'), {
+      name: 'plain-rn-app',
+      dependencies: {
+        'react-native': '0.82.1',
+      },
+    });
+    writeJson(path.join(tempRoot, 'node_modules/@expo/cli/package.json'), {
+      name: '@expo/cli',
+      version: '0.10.17',
+      main: 'build/index.js',
+    });
+    writeFile(path.join(tempRoot, 'node_modules/@expo/cli/build/index.js'));
+
+    const resolved = resolveExpoCli(tempRoot);
+
+    expect(resolved).toEqual({
+      cliPath: '',
+      usingExpo: false,
+    });
+  });
+
+  test('uses expo cli when project package.json declares expo dependency', () => {
+    writeJson(path.join(tempRoot, 'package.json'), {
+      name: 'expo-app',
+      dependencies: {
+        expo: '^54.0.0',
+      },
+    });
+    writeJson(path.join(tempRoot, 'node_modules/expo/package.json'), {
+      name: 'expo',
+      version: '54.0.0',
+    });
+    writeJson(path.join(tempRoot, 'node_modules/@expo/cli/package.json'), {
+      name: '@expo/cli',
+      version: '0.10.17',
+      main: 'build/index.js',
+    });
+    writeFile(path.join(tempRoot, 'node_modules/@expo/cli/build/index.js'));
+
+    const resolved = resolveExpoCli(tempRoot);
+
+    expect(resolved.usingExpo).toBe(true);
+    expect(fs.realpathSync(resolved.cliPath)).toBe(
+      fs.realpathSync(
+        path.join(tempRoot, 'node_modules/@expo/cli/build/index.js'),
+      ),
+    );
+  });
+});