Make bridgeless build with Static frameworks

Summary: This changes allow React Native to build with Static Frameworks on iOS. The major problem we encountered was that objective-c headers should not import C++ files. C++ headers must only be used by `.mm` files. ## Changelog: [iOS][Fixed] - Make bridgeless works with static frameworks Differential Revision: D47023664 fbshipit-source-id: c2a68df07132efd4fbf54af1708fa33cffd20e66
luluwu2032 · Jun 29, 2023 · 5142be7 · 5142be7
1 parent d539ee6
commit 5142be7
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 4 deletions.
diff --git a/packages/react-native/React/CxxBridge/NSDataBigString.h b/packages/react-native/React/CxxBridge/NSDataBigString.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifdef __cplusplus
 #import <Foundation/Foundation.h>
 
 #include <cxxreact/JSBigString.h>
@@ -38,3 +39,4 @@ class NSDataBigString : public JSBigString {
 };
 
 } // namespace facebook::react
+#endif
diff --git a/packages/react-native/React/CxxBridge/RCTCxxBridgeDelegate.h b/packages/react-native/React/CxxBridge/RCTCxxBridgeDelegate.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifdef __cplusplus
 #include <memory>
 
 #import <React/RCTBridgeDelegate.h>
@@ -29,3 +30,4 @@ class JSExecutorFactory;
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge;
 
 @end
+#endif
diff --git a/packages/react-native/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.h b/packages/react-native/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#ifdef __cplusplus
 #include <jsireact/JSIExecutor.h>
 
 namespace facebook::react {
@@ -19,3 +20,4 @@ JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(
     JSIExecutor::RuntimeInstaller runtimeInstallerToWrap);
 
 } // namespace facebook::react
+#endif
diff --git a/packages/react-native/React/CxxBridge/RCTMessageThread.h b/packages/react-native/React/CxxBridge/RCTMessageThread.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifdef __cplusplus
 #import <memory>
 #import <string>
 
@@ -37,3 +38,4 @@ class RCTMessageThread : public MessageQueueThread,
 };
 
 } // namespace facebook::react
+#endif
diff --git a/packages/react-native/React/CxxBridge/RCTObjcExecutor.h b/packages/react-native/React/CxxBridge/RCTObjcExecutor.h
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
+#ifdef __cplusplus
 #include <functional>
 #include <memory>
 
@@ -29,3 +29,4 @@ class RCTObjcExecutorFactory : public JSExecutorFactory {
 };
 
 } // namespace facebook::react
+#endif
diff --git a/packages/react-native/React/CxxModule/DispatchMessageQueueThread.h b/packages/react-native/React/CxxModule/DispatchMessageQueueThread.h
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
+#ifdef __cplusplus
 #include <glog/logging.h>
 
 #include <React/RCTLog.h>
@@ -43,3 +43,4 @@ class DispatchMessageQueueThread : public MessageQueueThread {
 };
 
 } // namespace facebook::react
+#endif
diff --git a/packages/react-native/React/CxxModule/RCTCxxMethod.h b/packages/react-native/React/CxxModule/RCTCxxMethod.h
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
+#ifdef __cplusplus
 #import <Foundation/Foundation.h>
 
 #import <React/RCTBridgeMethod.h>
@@ -15,3 +15,4 @@
 - (instancetype)initWithCxxMethod:(const facebook::xplat::module::CxxModule::Method &)cxxMethod;
 
 @end
+#endif
diff --git a/packages/react-native/React/CxxModule/RCTCxxModule.h b/packages/react-native/React/CxxModule/RCTCxxModule.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifdef __cplusplus
 #import <memory>
 
 #import <Foundation/Foundation.h>
@@ -27,3 +28,4 @@ class CxxModule;
 - (std::unique_ptr<facebook::xplat::module::CxxModule>)createModule;
 
 @end
+#endif
diff --git a/packages/react-native/React/CxxModule/RCTCxxUtils.h b/packages/react-native/React/CxxModule/RCTCxxUtils.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifdef __cplusplus
 #include <functional>
 #include <memory>
 
@@ -25,3 +26,4 @@ NSError *tryAndReturnError(const std::function<void()> &func);
 NSString *deriveSourceURL(NSURL *url);
 
 } // namespace facebook::react
+#endif
diff --git a/packages/react-native/React/CxxModule/RCTNativeModule.h b/packages/react-native/React/CxxModule/RCTNativeModule.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifdef __cplusplus
 #import <React/RCTModuleData.h>
 #import <cxxreact/NativeModule.h>
 
@@ -30,3 +31,4 @@ class RCTNativeModule : public NativeModule {
 };
 
 } // namespace facebook::react
+#endif
diff --git a/packages/react-native/React/CxxUtils/RCTFollyConvert.h b/packages/react-native/React/CxxUtils/RCTFollyConvert.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifdef __cplusplus
 #import <Foundation/Foundation.h>
 
 #include <folly/dynamic.h>
@@ -15,3 +16,5 @@ folly::dynamic convertIdToFollyDynamic(id json);
 id convertFollyDynamicToId(const folly::dynamic &dyn);
 
 } // namespace facebook::react
+
+#endif
diff --git a/packages/react-native/scripts/cocoapods/fabric.rb b/packages/react-native/scripts/cocoapods/fabric.rb
@@ -12,6 +12,6 @@ def setup_fabric!(react_native_path: "../node_modules/react-native", new_arch_en
     pod 'React-graphics', :path => "#{react_native_path}/ReactCommon/react/renderer/graphics"
     pod 'React-RCTFabric', :path => "#{react_native_path}/React", :modular_headers => true
     pod 'React-ImageManager', :path => "#{react_native_path}/ReactCommon/react/renderer/imagemanager/platform/ios"
-    pod 'RCT-Folly/Fabric', :podspec => "#{react_native_path}/third-party-podspecs/RCT-Folly.podspec"
+    pod 'RCT-Folly/Fabric', :podspec => "#{react_native_path}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
     pod 'React-FabricImage', :path => "#{react_native_path}/ReactCommon"
 end