fix(macOS): Add support for react-native-macos v0.62 (#197)

microsoft · Aug 26, 2020 · e73a4d8 · e73a4d8
1 parent ef27b46
commit e73a4d8
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/example/package.json b/example/package.json
@@ -11,8 +11,8 @@
   },
   "peerDependencies": {
     "react": "~16.8.6 || ~16.9.0 || ~16.11.0 || ~16.13.1",
-    "react-native": "^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63 || 1000.0.0",
-    "react-native-macos": "^0.60 || ^0.61.39"
+    "react-native": "^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || 1000.0.0",
+    "react-native-macos": "^0.60.0 || ^0.61.0 || ^0.62.0"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",

diff --git a/ios/pod_helpers.rb b/ios/pod_helpers.rb
@@ -0,0 +1,10 @@
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+
+def try_pod(name, podspec, project_root)
+  pod name, :podspec => podspec if File.exist?(File.join(project_root, podspec))
+end
diff --git a/ios/use_react_native-0.60.rb b/ios/use_react_native-0.60.rb
@@ -6,6 +6,8 @@
 #
 # rubocop:disable Layout/LineLength
 
+require_relative('pod_helpers.rb')
+
 def include_react_native!(react_native:, target_platform:, project_root:, flipper_versions:)
   pod 'React', :path => react_native
   pod 'React-Core', :path => "#{react_native}/React", :inhibit_warnings => true
@@ -36,9 +38,10 @@ def include_react_native!(react_native:, target_platform:, project_root:, flippe
   pod 'glog', :podspec => "#{react_native}/third-party-podspecs/glog.podspec"
   pod 'Folly', :podspec => "#{react_native}/third-party-podspecs/Folly.podspec"
 
-  # Required by `react-native-macos` otherwise it will find Boost elsewhere
-  boost = "#{react_native}/third-party-podspecs/boost-for-react-native.podspec"
-  pod 'boost-for-react-native', :podspec => boost if File.exist?(File.join(project_root, boost))
+  # Required by `react-native-macos`; otherwise it will find Boost elsewhere
+  try_pod('boost-for-react-native',
+          "#{react_native}/third-party-podspecs/boost-for-react-native.podspec",
+          project_root)
 end
 
 # rubocop:enable Layout/LineLength
diff --git a/ios/use_react_native-0.62.rb b/ios/use_react_native-0.62.rb
@@ -6,6 +6,8 @@
 #
 # rubocop:disable Layout/LineLength
 
+require_relative('pod_helpers.rb')
+
 def add_flipper_pods!(versions = {})
   versions['Flipper'] ||= '~> 0.33.1'
   versions['DoubleConversion'] ||= '1.1.7'
@@ -70,7 +72,15 @@ def include_react_native!(react_native:, target_platform:, project_root:, flippe
 
   pod 'DoubleConversion', :podspec => "#{react_native}/third-party-podspecs/DoubleConversion.podspec"
   pod 'glog', :podspec => "#{react_native}/third-party-podspecs/glog.podspec"
-  pod 'Folly', :podspec => "#{react_native}/third-party-podspecs/Folly.podspec"
+
+  # `react-native` pods
+  try_pod('Folly', "#{react_native}/third-party-podspecs/Folly.podspec", project_root)
+
+  # `react-native-macos` pods
+  try_pod('RCT-Folly', "#{react_native}/third-party-podspecs/RCT-Folly.podspec", project_root)
+  try_pod('boost-for-react-native',
+          "#{react_native}/third-party-podspecs/boost-for-react-native.podspec",
+          project_root)
 end
 
 # rubocop:enable Layout/LineLength
diff --git a/package.json b/package.json
@@ -41,8 +41,8 @@
   },
   "peerDependencies": {
     "react": "~16.8.6 || ~16.9.0 || ~16.11.0 || ~16.13.1",
-    "react-native": "^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63 || 1000.0.0",
-    "react-native-macos": "^0.60 || ^0.61.39"
+    "react-native": "^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || 1000.0.0",
+    "react-native-macos": "^0.60.0 || ^0.61.0 || ^0.62.0"
   },
   "peerDependenciesMeta": {
     "react-native-macos": {