feat(breaking): use 'podspecPath' instead of 'podspec', make it smarter

docs/dependencies.md

@@ -56,7 +56,7 @@ The following settings are available on iOS and Android:
 ```ts
 type DependencyParamsIOST = {
   project?: string;
-  podspec?: string;
+  podspecPath?: string;
   sharedLibraries?: string[];
 };
 
@@ -70,11 +70,11 @@ type DependencyParamsAndroidT = {
 
 #### platforms.ios.project
 
-Custom path to `.xcodeproj`
+Custom path to `.xcodeproj`.
 
-#### platforms.ios.podspec
+#### platforms.ios.podspecPath
 
-Custom `podspec` name to use when auto-linking (without the file extension). Your `podspec` file must be located in the root of the dependency package.
+Custom path to `.podspec` file to use when auto-linking. Example: `node_modules/react-native-module/ios/module.podspec`.
 
 #### platforms.ios.sharedLibraries
 

docs/platforms.md

@@ -83,7 +83,7 @@ type ProjectConfigIOST = {
   folder: string;
   pbxprojPath: string;
   podfile: null;
-  podspec: null;
+  podspecPath: null;
   projectPath: string;
   projectName: string;
   libraryFolder: string;

docs/projects.md

@@ -81,6 +81,7 @@ type ProjectParamsAndroidT = {
 
 type ProjectParamsIOST = {
   project?: string;
+  podspecPath?: string;
   sharedLibraries?: string[];
   libraryFolder?: string;
   plist: any[];

packages/cli/src/tools/config/__tests__/__snapshots__/index-test.js.snap

@@ -91,7 +91,7 @@ Object {
       "pbxprojPath": "<<REPLACED>>/node_modules/react-native-test/ios/HelloWorld.xcodeproj/project.pbxproj",
       "plist": Array [],
       "podfile": null,
-      "podspec": null,
+      "podspecPath": null,
       "projectName": "HelloWorld.xcodeproj",
       "projectPath": "<<REPLACED>>/node_modules/react-native-test/ios/HelloWorld.xcodeproj",
       "sharedLibraries": Array [],
@@ -125,7 +125,7 @@ Object {
       "pbxprojPath": "<<REPLACED>>/node_modules/react-native-foo/customLocation/customProject.xcodeproj/project.pbxproj",
       "plist": Array [],
       "podfile": null,
-      "podspec": null,
+      "podspecPath": null,
       "projectName": "customProject.xcodeproj",
       "projectPath": "<<REPLACED>>/node_modules/react-native-foo/customLocation/customProject.xcodeproj",
       "sharedLibraries": Array [],
@@ -164,7 +164,7 @@ Object {
       "pbxprojPath": "<<REPLACED>>/node_modules/react-native-test/customLocation/customProject.xcodeproj/project.pbxproj",
       "plist": Array [],
       "podfile": null,
-      "podspec": "ReactNativeTest",
+      "podspecPath": "<<REPLACED>>/node_modules/react-native-test/ReactNativeTest.podspec",
       "projectName": "customProject.xcodeproj",
       "projectPath": "<<REPLACED>>/node_modules/react-native-test/customLocation/customProject.xcodeproj",
       "sharedLibraries": Array [],
@@ -201,7 +201,7 @@ Object {
         "pbxprojPath": "<<REPLACED>>/node_modules/react-native-test/ios/HelloWorld.xcodeproj/project.pbxproj",
         "plist": Array [],
         "podfile": null,
-        "podspec": null,
+        "podspecPath": null,
         "projectName": "HelloWorld.xcodeproj",
         "projectPath": "<<REPLACED>>/node_modules/react-native-test/ios/HelloWorld.xcodeproj",
         "sharedLibraries": Array [],

packages/cli/src/tools/config/schema.js

@@ -49,7 +49,7 @@ export const dependencyConfig = t
             ios: t
               .object({
                 project: t.string(),
-                podspec: t.string(),
+                podspecPath: t.string(),
                 sharedLibraries: t.array().items(t.string()),
                 libraryFolder: t.string(),
               })
@@ -113,7 +113,7 @@ export const projectConfig = t
                 folder: t.string(),
                 pbxprojPath: t.string(),
                 podfile: t.string(),
-                podspec: t.string(),
+                podspecPath: t.string(),
                 projectPath: t.string(),
                 projectName: t.string(),
                 libraryFolder: t.string(),

packages/platform-ios/native_modules.rb

@@ -41,7 +41,7 @@ def use_native_modules!(root = "..", packages = nil)
   packages.each do |package_name, package|
     next unless package_config = package["platforms"]["ios"]
 
-    podspec_path = File.join(package["root"], "#{package_config["podspec"]}.podspec")
+    podspec_path = package_config["podspecPath"]
     spec = Pod::Specification.from_file(podspec_path)
 
     # We want to do a look up inside the current CocoaPods target
@@ -57,7 +57,7 @@ def use_native_modules!(root = "..", packages = nil)
       existing_dep.name.split('/').first == spec.name
     end
 
-    pod spec.name, :path => package["root"]
+    pod spec.name, :path => File.dirname(podspec_path)
 
     if package_config["scriptPhases"]
       # Can be either an object, or an array of objects
@@ -126,16 +126,16 @@ def pluralize(count)
       }
 
       @ios_package = ios_package = {
-        "root" => "/Users/grabbou/Repositories/WebViewDemoApp/node_modules/react",
+        "root" => "/root/app/node_modules/react",
         "platforms" => {
           "ios" => {
-            "podspec" => "React",
+            "podspecPath" => "/root/app/node_modules/react/React.podspec",
           },
           "android" => nil,
         },
       }
       @android_package = {
-        "root" => "/Users/grabbou/Repositories/WebViewDemoApp/node_modules/react-native-google-play-game-services",
+        "root" => "/root/app/node_modules/react-native-google-play-game-services",
         "platforms" => {
           "ios" => nil,
           "android" => {
@@ -160,7 +160,7 @@ def pluralize(count)
       end
 
       Pod::Specification.singleton_class.send(:define_method, :from_file) do |podspec_path|
-        podspec_path.must_equal File.join(ios_package["root"], "#{ios_package["platforms"]["ios"]["podspec"]}.podspec")
+        podspec_path.must_equal ios_package["platforms"]["ios"]["podspecPath"]
         spec
       end
 

packages/platform-ios/src/config/__tests__/findPodspecName-test.js → packages/platform-ios/src/config/__tests__/findPodspec-test.js

@@ -4,30 +4,32 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+javascript_foundation
+ * @flow
  */
 
-import findPodspecName from '../findPodspecName';
+import findPodspec from '../findPodspec';
 import * as projects from '../__fixtures__/projects';
 
 jest.mock('path');
 jest.mock('fs');
 
 const fs = require('fs');
 
-describe('ios::findPodspecName', () => {
+describe('ios::findPodspec', () => {
   it('returns null if there is not podspec file', () => {
+    // $FlowFixMe
     fs.__setMockFilesystem(projects.flat);
-    expect(findPodspecName('')).toBeNull();
+    expect(findPodspec('')).toBeNull();
   });
 
   it('returns podspec name if only one exists', () => {
+    // $FlowFixMe
     fs.__setMockFilesystem(projects.withPods.ios);
-    expect(findPodspecName('/')).toBe('TestPod');
+    expect(findPodspec('/')).toBe('/TestPod.podspec');
   });
 
   it('returns podspec name that match packet directory', () => {
+    // $FlowFixMe
     fs.__setMockFilesystem({
       user: {
         PacketName: {
@@ -36,10 +38,13 @@ describe('ios::findPodspecName', () => {
         },
       },
     });
-    expect(findPodspecName('/user/PacketName')).toBe('PacketName');
+    expect(findPodspec('/user/PacketName')).toBe(
+      '/user/PacketName/PacketName.podspec',
+    );
   });
 
   it('returns first podspec name if not match in directory', () => {
+    // $FlowFixMe
     fs.__setMockFilesystem({
       user: {
         packet: {
@@ -48,6 +53,6 @@ describe('ios::findPodspecName', () => {
         },
       },
     });
-    expect(findPodspecName('/user/packet')).toBe('Another');
+    expect(findPodspec('/user/packet')).toBe('/user/packet/Another.podspec');
   });
 });

packages/platform-ios/src/config/findPodspec.js

@@ -0,0 +1,21 @@
+/**
+ * @flow
+ */
+
+import glob from 'glob';
+import path from 'path';
+
+export default function findPodspec(folder: string): string | null {
+  const podspecs = glob.sync('*.podspec', {cwd: folder});
+
+  if (podspecs.length === 0) {
+    return null;
+  }
+
+  const packagePodspec = path.basename(folder) + '.podspec';
+  const podspecFile = podspecs.includes(packagePodspec)
+    ? packagePodspec
+    : podspecs[0];
+
+  return path.join(folder, podspecFile);
+}

packages/platform-ios/src/config/getPodspecName.js

@@ -0,0 +1,13 @@
+/**
+ * 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.
+ *
+ * @flow
+ */
+import path from 'path';
+
+export default function getPodspecName(podspecFile: string) {
+  return path.basename(podspecFile).replace(/\.podspec$/, '');
+}

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

@@ -11,7 +11,7 @@
 import path from 'path';
 import findProject from './findProject';
 import findPodfilePath from './findPodfilePath';
-import findPodspecName from './findPodspecName';
+import findPodspec from './findPodspec';
 import type {UserConfigT} from 'types';
 
 /**
@@ -47,13 +47,19 @@ export function projectConfig(
   }
 
   const projectPath = path.join(folder, project);
+  const sourceDir = path.dirname(projectPath);
 
   return {
-    sourceDir: path.dirname(projectPath),
+    sourceDir,
     folder,
     pbxprojPath: path.join(projectPath, 'project.pbxproj'),
     podfile: findPodfilePath(projectPath),
-    podspec: userConfig.podspec || findPodspecName(folder),
+    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),
     libraryFolder: userConfig.libraryFolder || 'Libraries',

packages/platform-ios/src/link-pods/__tests__/isInstalled-test.js

@@ -17,27 +17,27 @@ const PODFILES_PATH = path.join(__dirname, '../__fixtures__/');
 describe('pods::isInstalled', () => {
   it('returns false if pod is missing', () => {
     const project = {podfile: path.join(PODFILES_PATH, 'PodfileSimple')};
-    const podspecName = {podspec: 'NotExisting'};
+    const podspecName = {podspecPath: '/path/NotExisting'};
     expect(isInstalled(project, podspecName)).toBe(false);
   });
 
   it('returns true for existing pod with version number', () => {
     const project = {podfile: path.join(PODFILES_PATH, 'PodfileSimple')};
-    const podspecName = {podspec: 'TestPod'};
+    const podspecName = {podspecPath: '/path/TestPod.podspec'};
     expect(isInstalled(project, podspecName)).toBe(true);
   });
 
   it('returns true for existing pod with path', () => {
     const project = {podfile: path.join(PODFILES_PATH, 'PodfileWithTarget')};
-    const podspecName = {podspec: 'Yoga'};
+    const podspecName = {podspecPath: '/path/Yoga.podspec'};
     expect(isInstalled(project, podspecName)).toBe(true);
   });
 
   it('returns true for existing pod with multiline definition', () => {
     const project = {
       podfile: path.join(PODFILES_PATH, 'PodfileWithFunction'),
     };
-    const podspecName = {podspec: 'React'};
+    const podspecName = {podspecPath: '/path/React.podspec'};
     expect(isInstalled(project, podspecName)).toBe(true);
   });
 });

packages/platform-ios/src/link-pods/addPodEntry.js

@@ -4,18 +4,22 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
+ * @flow
  */
 
 import {logger} from '@react-native-community/cli-tools';
+import getPodspecName from '../config/getPodspecName';
 
 export default function addPodEntry(
-  podLines,
-  linesToAddEntry,
-  podName,
-  nodePath,
+  podLines: Array<string>,
+  linesToAddEntry?:
+    | Array<{line: number, indentation: number}>
+    | {line: number, indentation: number},
+  podspecPath: string,
+  nodeModulePath: string,
 ) {
-  const newEntry = `pod '${podName}', :path => '../node_modules/${nodePath}'\n`;
+  const podName = getPodspecName(podspecPath);
+  const newEntry = `pod '${podName}', :path => '../node_modules/${nodeModulePath}'\n`;
 
   if (!linesToAddEntry) {
     return;

packages/platform-ios/src/link-pods/findMarkedLinesInPodfile.js

@@ -4,12 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
+ * @flow
  */
 
 export const MARKER_TEXT = '# Add new pods below this line';
 
-export default function findMarkedLinesInPodfile(podLines) {
+export default function findMarkedLinesInPodfile(podLines: Array<string>) {
   const result = [];
   for (let i = 0, len = podLines.length; i < len; i++) {
     if (podLines[i].includes(MARKER_TEXT)) {

packages/platform-ios/src/link-pods/isInstalled.js

@@ -8,14 +8,15 @@
  */
 
 import readPodfile from './readPodfile';
+import getPodspecName from '../config/getPodspecName';
 
 export default function isInstalled(iOSProject, dependencyConfig) {
   if (!iOSProject.podfile) {
     return false;
   }
   // match line with pod declaration: pod 'dependencyPodName' (other possible parameters of pod are ignored)
   const dependencyRegExp = new RegExp(
-    `pod\\s+('|")${dependencyConfig.podspec}('|")`,
+    `pod\\s+('|")${getPodspecName(dependencyConfig.podspecPath)}('|")`,
     'g',
   );
   const podLines = readPodfile(iOSProject.podfile);