From 478d560b10862c6951d1d0ed16b7e1ead349d17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= Date: Tue, 28 Oct 2025 17:05:26 +0100 Subject: [PATCH 1/3] Moved "ios" into a shared "apple" directory --- packages/host/{ios => apple}/NodeApiHostModuleProvider.mm | 0 packages/host/react-native-node-api.podspec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/host/{ios => apple}/NodeApiHostModuleProvider.mm (100%) diff --git a/packages/host/ios/NodeApiHostModuleProvider.mm b/packages/host/apple/NodeApiHostModuleProvider.mm similarity index 100% rename from packages/host/ios/NodeApiHostModuleProvider.mm rename to packages/host/apple/NodeApiHostModuleProvider.mm diff --git a/packages/host/react-native-node-api.podspec b/packages/host/react-native-node-api.podspec index 5066e82d..691dbf19 100644 --- a/packages/host/react-native-node-api.podspec +++ b/packages/host/react-native-node-api.podspec @@ -28,7 +28,7 @@ Pod::Spec.new do |s| s.platforms = { :ios => min_ios_version_supported } s.source = { :git => "https://github.com/callstackincubator/react-native-node-api.git", :tag => "#{s.version}" } - s.source_files = "ios/**/*.{h,m,mm}", "cpp/**/*.{hpp,cpp,c,h}", "weak-node-api/include/*.h", "weak-node-api/*.hpp" + s.source_files = "apple/**/*.{h,m,mm}", "cpp/**/*.{hpp,cpp,c,h}", "weak-node-api/include/*.h", "weak-node-api/*.hpp" s.public_header_files = "weak-node-api/include/*.h" s.vendored_frameworks = "auto-linked/apple/*.xcframework", "weak-node-api/weak-node-api.xcframework" From 4805e5a6c1f1c85b576e733c1e6ac0a3399b3a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= Date: Tue, 28 Oct 2025 17:06:54 +0100 Subject: [PATCH 2/3] Simplify Apple host module provider --- .../host/apple/NodeApiHostModuleProvider.mm | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/packages/host/apple/NodeApiHostModuleProvider.mm b/packages/host/apple/NodeApiHostModuleProvider.mm index d4ecd94f..b01c5306 100644 --- a/packages/host/apple/NodeApiHostModuleProvider.mm +++ b/packages/host/apple/NodeApiHostModuleProvider.mm @@ -1,26 +1,12 @@ #import "CxxNodeApiHostModule.hpp" #import "WeakNodeApiInjector.hpp" -#define USE_CXX_TURBO_MODULE_UTILS 0 -#if defined(__has_include) -#if __has_include() -#undef USE_CXX_TURBO_MODULE_UTILS -#define USE_CXX_TURBO_MODULE_UTILS 1 -#endif -#endif - -#if USE_CXX_TURBO_MODULE_UTILS #import @interface NodeApiHost : NSObject -#else -#import -@interface NodeApiHost : NSObject -#endif // USE_CXX_TURBO_MODULE_UTILS @end @implementation NodeApiHost -#if USE_CXX_TURBO_MODULE_UTILS + (void)load { callstack::nodeapihost::injectIntoWeakNodeApi(); @@ -31,14 +17,5 @@ + (void)load { jsInvoker); }); } -#else -RCT_EXPORT_MODULE() - -- (std::shared_ptr)getTurboModule: - (const facebook::react::ObjCTurboModule::InitParams &)params { - return std::make_shared( - params.jsInvoker); -} -#endif // USE_CXX_TURBO_MODULE_UTILS @end \ No newline at end of file From 328d75c3645d1418483b1df799f3469a4c71b270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= Date: Sun, 2 Nov 2025 13:23:33 +0100 Subject: [PATCH 3/3] Add changeset --- .changeset/sad-poets-smoke.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/sad-poets-smoke.md diff --git a/.changeset/sad-poets-smoke.md b/.changeset/sad-poets-smoke.md new file mode 100644 index 00000000..8c5c1990 --- /dev/null +++ b/.changeset/sad-poets-smoke.md @@ -0,0 +1,5 @@ +--- +"react-native-node-api": patch +--- + +Moved and simplify Apple host TurboModule