fix(platform-ios): detect Podfile and .xcworkspace

Author: tido64

packages/platform-ios/src/config/__tests__/findPodfilePath.test.ts

@@ -6,7 +6,7 @@
  *
  */
 
-import findProject from '../findProject';
+import {findXcodeProject as findProject} from '../findProject';
 import * as projects from '../__fixtures__/projects';
 
 jest.mock('path');

packages/platform-ios/src/config/__tests__/findProject.test.ts

@@ -8,11 +8,12 @@
 
 import glob from 'glob';
 import path from 'path';
+import isXcodeProject from './isXcodeProject';
 
 /**
  * Glob pattern to look for xcodeproj
  */
-const GLOB_PATTERN = '**/*.xcodeproj';
+const GLOB_PATTERN = '**/*.{xcodeproj,xcworkspace}';
 
 /**
  * Regexp matching all test projects
@@ -29,17 +30,9 @@ const IOS_BASE = 'ios';
  */
 const GLOB_EXCLUDE_PATTERN = ['**/@(Pods|node_modules|Carthage)/**'];
 
-/**
- * Finds iOS project by looking for all .xcodeproj files
- * in given folder.
- *
- * Returns first match if files are found or null
- *
- * Note: `./ios/*.xcodeproj` are returned regardless of the name
- */
-export default function findProject(folder: string): string | null {
-  const projects = glob
-    .sync(GLOB_PATTERN, {
+function findProject(folder: string, pattern: string): string[] {
+  return glob
+    .sync(pattern, {
       cwd: folder,
       ignore: GLOB_EXCLUDE_PATTERN,
     })
@@ -48,10 +41,37 @@ export default function findProject(folder: string): string | null {
         path.dirname(project) === IOS_BASE || !TEST_PROJECTS.test(project),
     )
     .sort((project) => (path.dirname(project) === IOS_BASE ? -1 : 1));
+}
 
+/**
+ * Finds a `Podfile` in given folder.
+ *
+ * Returns first match if files are found or null
+ *
+ * Note: `./ios/Podfile` are returned regardless of the name
+ */
+export function findPodfile(folder: string): string | null {
+  const projects = findProject(folder, '**/Podfile');
   if (projects.length === 0) {
     return null;
   }
 
   return projects[0];
 }
+
+/**
+ * Finds iOS project by looking for all .xcodeproj files
+ * in given folder.
+ *
+ * Returns first match if files are found or null
+ *
+ * Note: `./ios/*.xcodeproj` are returned regardless of the name
+ */
+export function findXcodeProject(folder: string): string | null {
+  const projects = findProject(folder, GLOB_PATTERN);
+  if (projects.length === 0) {
+    return null;
+  }
+
+  return projects.find(isXcodeProject) || projects[0];
+}

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

@@ -8,15 +8,16 @@
 
 import path from 'path';
 import {memoize} from 'lodash';
-import findProject from './findProject';
-import findPodfilePath from './findPodfilePath';
+import {findPodfile, findXcodeProject} from './findProject';
 import findPodspec from './findPodspec';
+import isXcodeProject from './isXcodeProject';
 import {
   IOSProjectParams,
   IOSDependencyParams,
 } from '@react-native-community/cli-types';
 
-const memoizedFindProject = memoize(findProject);
+const memoizedFindPodfile = memoize(findPodfile);
+const memoizedFindProject = memoize(findXcodeProject);
 
 /**
  * For libraries specified without an extension, add '.tbd' for those that
@@ -38,31 +39,41 @@ export function projectConfig(folder: string, userConfig: IOSProjectParams) {
   if (!userConfig) {
     return;
   }
+
+  const podfile = memoizedFindPodfile(folder);
   const project = userConfig.project || memoizedFindProject(folder);
 
   /**
    * No iOS config found here
    */
-  if (!project) {
+  if (!project && !podfile) {
     return null;
   }
 
-  const projectPath = path.join(folder, project);
-  const sourceDir = path.dirname(projectPath);
+  const projectPath = project && path.join(folder, project);
+
+  // Source files may be referenced from anywhere in a `.xcodeproj`. CocoaPods,
+  // on the other hand, is a lot stricter because files cannot live outside the
+  // folder in which `Podfile` resides. If we found a `Podfile`, it's a strong
+  // indication that source files are in that directory.
+  const sourceDir = path.resolve(path.dirname(podfile || projectPath || ''));
 
   return {
     sourceDir,
     folder,
-    pbxprojPath: path.join(projectPath, 'project.pbxproj'),
-    podfile: findPodfilePath(projectPath),
+    pbxprojPath:
+      projectPath && isXcodeProject(projectPath)
+        ? path.join(projectPath, 'project.pbxproj')
+        : null,
+    podfile: podfile && path.resolve(podfile),
     podspecPath:
       userConfig.podspecPath ||
       // podspecs are usually placed in the root dir of the library or in the
       // iOS project path
       findPodspec(folder) ||
       findPodspec(sourceDir),
     projectPath,
-    projectName: path.basename(projectPath),
+    projectName: projectPath && path.basename(projectPath),
     libraryFolder: userConfig.libraryFolder || 'Libraries',
     sharedLibraries: mapSharedLibaries(userConfig.sharedLibraries || []),
     plist: userConfig.plist || [],

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

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+export default function isXcodeProject(projectPath: string): boolean {
+  return projectPath.endsWith('.xcodeproj');
+}

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

@@ -12,8 +12,12 @@ export default function warnAboutManuallyLinkedLibs(
     Config['platforms']['ios']['linkConfig']
   > = getLinkConfig(),
 ) {
-  let deps: Array<string> = [];
   const projectConfig = config.project[platform];
+  if (projectConfig.pbxprojPath === null) {
+    return;
+  }
+
+  let deps: Array<string> = [];
 
   for (let key in config.dependencies) {
     const dependency = config.dependencies[key];