chore: move findXcodeProj to config and upgrade run-ios

packages/cli-types/src/ios.ts

@@ -7,6 +7,10 @@ export interface IOSProjectParams {}
 
 export interface IOSProjectConfig {
   sourceDir: string;
+  xcodeProject: {
+    name: string;
+    isWorkspace: boolean;
+  } | null;
 }
 
 export interface IOSDependencyConfig {

packages/cli/src/commands/upgrade/upgrade.ts

@@ -7,7 +7,6 @@ import {Config} from '@react-native-community/cli-types';
 import {logger, CLIError, fetch} from '@react-native-community/cli-tools';
 import * as PackageManager from '../../tools/packageManager';
 import {installPods} from '@react-native-community/cli-doctor';
-import {findXcodeProject} from '@react-native-community/cli-platform-ios';
 
 type UpgradeError = {message: string; stderr: string};
 
@@ -112,13 +111,11 @@ const getPatch = async (
       return;
     }
     if (platform === 'ios') {
-      const project = findXcodeProject(
-        fs.readdirSync(config.project[platform]!.sourceDir),
-      );
-      if (project) {
+      const xcodeProject = config.project.ios!.xcodeProject;
+      if (xcodeProject) {
         patchWithRenamedProjects = patchWithRenamedProjects.replace(
           new RegExp('RnDiffApp', 'g'),
-          project.name.replace('.xcodeproj', ''),
+          xcodeProject.name.replace('.xcodeproj', ''),
         );
       }
     } else if (platform === 'android') {

packages/platform-ios/src/config/index.ts

@@ -6,21 +6,27 @@
  *
  */
 import path from 'path';
+import fs from 'fs';
 import findPodfilePath from './findPodfilePath';
+import findXcodeProject from './findXcodeProject';
 import findPodspec from './findPodspec';
 import {
   IOSProjectParams,
   IOSDependencyParams,
+  IOSProjectConfig,
 } from '@react-native-community/cli-types';
 import {logger} from '@react-native-community/cli-tools';
 
 /**
  * Returns project config by analyzing given folder and applying some user defaults
  * when constructing final object
  */
-export function projectConfig(folder: string, userConfig: IOSProjectParams) {
+export function projectConfig(
+  folder: string,
+  userConfig: IOSProjectParams,
+): IOSProjectConfig | null {
   if (!userConfig) {
-    return;
+    return null;
   }
 
   const podfile = findPodfilePath(folder);
@@ -34,8 +40,11 @@ export function projectConfig(folder: string, userConfig: IOSProjectParams) {
     return null;
   }
 
+  const xcodeProject = findXcodeProject(fs.readdirSync(folder));
+
   return {
     sourceDir: path.dirname(podfile),
+    xcodeProject,
   };
 }
 

packages/platform-ios/src/index.ts

@@ -4,4 +4,3 @@
 
 export {default as commands} from './commands';
 export {projectConfig, dependencyConfig} from './config';
-export {default as findXcodeProject} from './commands/runIOS/findXcodeProject';