Skip to content

Extract react/bridging into its own React-bridging pod #57354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
javache wants to merge 1 commit into
base: main
Choose a base branch
from
+69 −26
Open

Extract react/bridging into its own React-bridging pod #57354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions packages/react-native/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,12 @@ let reactRuntimeScheduler = RNTarget(
dependencies: [.reactNativeDependencies, .reactFeatureFlags, .reactCxxReact, .reactPerfLogger, .reactPerformanceTimeline, .reactRendererConsistency, .reactUtils, .reactRuntimeExecutor]
)

/// ReactCommon.podspec
/// This target represent the ReactCommon/turbomodule/bridging subspec
/// React-bridging.podspec
let reactTurboModuleBridging = RNTarget(
name: .reactTurboModuleBridging,
path: "ReactCommon/react/bridging",
excludedPaths: ["tests"],
dependencies: [.reactNativeDependencies, .reactPerfLogger, .reactCxxReact, .jsi, .logger]
dependencies: [.reactNativeDependencies, .reactPerfLogger, .jsi, .logger]
)

/// React-jserrorhandler.podspec
Expand Down Expand Up @@ -904,7 +903,7 @@ extension String {
static let reactRCTLinking = "React-RCTLinking"
static let reactCoreModules = "React-CoreModules"
static let reactRCTAnimatedModuleProvider = "RCTAnimatedModuleProvider"
static let reactTurboModuleBridging = "ReactCommon/turbomodule/bridging"
static let reactTurboModuleBridging = "React-bridging"
static let reactTurboModuleCore = "ReactCommon/turbomodule/core"
static let reactTurboModuleCoreDefaults = "ReactCommon/turbomodule/core/defaults"
static let reactTurboModuleCoreMicrotasks = "ReactCommon/turbomodule/core/microtasks"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/React/React-RCTFBReactNativeSpec.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Pod::Spec.new do |s|
s.dependency "React-NativeModulesApple"

add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
add_dependency(s, "ReactCommon", :subspec => "turbomodule/bridging", :additional_framework_paths => ["react/nativemodule/bridging"])
s.dependency "React-bridging"

depend_on_js_engine(s)
add_rn_third_party_dependencies(s)
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/React-Fabric.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Pod::Spec.new do |s|
s.dependency "React-featureflags"
s.dependency "React-runtimescheduler"
s.dependency "React-cxxreact"
s.dependency "React-bridging"

add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
add_dependency(s, "React-rendererdebug")
Expand Down
14 changes: 2 additions & 12 deletions packages/react-native/ReactCommon/ReactCommon.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,17 @@ Pod::Spec.new do |s|
s.subspec "turbomodule" do |ss|
ss.dependency "React-callinvoker", version
ss.dependency "React-perflogger", version
ss.dependency "React-cxxreact", version
ss.dependency "React-jsi", version
ss.dependency "React-logger", version
if use_hermes()
ss.dependency "hermes-engine"
end

ss.subspec "bridging" do |sss|
sss.dependency "React-jsi", version
sss.source_files = podspec_sources("react/bridging/**/*.{cpp,h}", "react/bridging/**/*.h")
sss.exclude_files = "react/bridging/tests"
sss.header_dir = "react/bridging"
sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
if use_hermes()
sss.dependency "hermes-engine"
end
end

ss.subspec "core" do |sss|
sss.source_files = podspec_sources("react/nativemodule/core/ReactCommon/**/*.{cpp,h}", "react/nativemodule/core/ReactCommon/**/*.h")
sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_featureflags.framework/Headers\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-utils/React_utils.framework/Headers\"" }
sss.dependency "React-bridging"
sss.dependency "React-cxxreact", version
sss.dependency "React-debug", version
sss.dependency "React-featureflags", version
sss.dependency "React-utils", version
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Pod::Spec.new do |s|

s.dependency "React-jsi"
s.dependency "React-cxxreact"
s.dependency "ReactCommon/turbomodule/bridging"
s.dependency "React-bridging"
add_dependency(s, "React-featureflags")
add_dependency(s, "React-debug")

Expand Down
46 changes: 46 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/React-bridging.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

require "json"

package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json")))
version = package['version']

source = { :git => 'https://github.com/facebook/react-native.git' }
if version == '1000.0.0'
# This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
else
source[:tag] = "v#{version}"
end

Pod::Spec.new do |s|
s.name = "React-bridging"
s.version = version
s.summary = "-"
s.homepage = "https://reactnative.dev/"
s.license = package["license"]
s.author = "Meta Platforms, Inc. and its affiliates"
s.platforms = min_supported_versions
s.source = source
s.source_files = podspec_sources("*.{cpp,h}", "*.h")
s.header_dir = "react/bridging"
s.pod_target_xcconfig = {
"USE_HEADERMAP" => "YES",
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"DEFINES_MODULE" => "YES"
}

resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_bridging")

s.dependency "React-jsi"
s.dependency "React-callinvoker"
s.dependency "React-timing"
s.dependency "React-logger"
s.dependency "React-perflogger"

add_rn_third_party_dependencies(s)
add_rncore_dependency(s)
end
2 changes: 1 addition & 1 deletion ...-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Pod::Spec.new do |s|
s.source_files = podspec_sources("ReactCommon/**/*.{mm,cpp,h}", "ReactCommon/**/*.{h}")

s.dependency "ReactCommon/turbomodule/core"
s.dependency "ReactCommon/turbomodule/bridging"
s.dependency "React-bridging"
s.dependency "React-callinvoker"
s.dependency "React-Core"
s.dependency "React-cxxreact"
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Pod::Spec.new do |s|

s.dependency "Yoga"
s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"
s.dependency "React-Fabric"
s.dependency "React-Fabric/bridging"
s.dependency "React-FabricComponents"
Expand Down
1 change: 1 addition & 0 deletions ...tive/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Pod::Spec.new do |s|
add_rncore_dependency(s)

s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"
s.dependency "React-runtimescheduler"
add_dependency(s, "React-RCTFBReactNativeSpec")
add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
Expand Down
1 change: 1 addition & 0 deletions ...on/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Pod::Spec.new do |s|
add_rncore_dependency(s)

s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"

s.dependency "React-Fabric"
s.dependency "React-Fabric/bridging"
Expand Down
1 change: 1 addition & 0 deletions ...eactCommon/react/nativemodule/mutationobserver/React-mutationobservernativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Pod::Spec.new do |s|
add_rncore_dependency(s)

s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"

s.dependency "React-Fabric"
s.dependency "React-Fabric/bridging"
Expand Down
1 change: 1 addition & 0 deletions ...ve/ReactCommon/react/nativemodule/webperformance/React-webperformancenativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Pod::Spec.new do |s|
add_rncore_dependency(s)

s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"

add_dependency(s, "React-RCTFBReactNativeSpec")
add_dependency(s, "React-performancetimeline")
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def get_podspec_no_fabric_no_script
"React-Core": [],
"React-jsi": [],
"React-jsiexecutor": [],
"ReactCommon/turbomodule/bridging": [],
"React-bridging": [],
"ReactCommon/turbomodule/core": [],
"hermes-engine": [],
"React-NativeModulesApple": [],
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths
{ :dependency_name => "ReactCodegen" },
{ :dependency_name => "RCTRequired" },
{ :dependency_name => "RCTTypeSafety" },
{ :dependency_name => "ReactCommon/turbomodule/bridging" },
{ :dependency_name => "React-bridging" },
{ :dependency_name => "ReactCommon/turbomodule/core" },
{ :dependency_name => "React-NativeModulesApple" },
{ :dependency_name => "Yoga" },
Expand Down Expand Up @@ -203,7 +203,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler
{ :dependency_name => "ReactCodegen" },
{ :dependency_name => "RCTRequired" },
{ :dependency_name => "RCTTypeSafety" },
{ :dependency_name => "ReactCommon/turbomodule/bridging" },
{ :dependency_name => "React-bridging" },
{ :dependency_name => "ReactCommon/turbomodule/core" },
{ :dependency_name => "React-NativeModulesApple" },
{ :dependency_name => "Yoga" },
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/scripts/cocoapods/new_architecture.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version = He

spec.dependency "RCTRequired"
spec.dependency "RCTTypeSafety"
spec.dependency "ReactCommon/turbomodule/bridging"
spec.dependency "React-bridging"
spec.dependency "ReactCommon/turbomodule/core"
spec.dependency "React-NativeModulesApple"
spec.dependency "Yoga"
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/scripts/cocoapods/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ def self.update_search_paths(installer)
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon-Samples", "ReactCommon_Samples", ["platform/ios"]))
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"], false))
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-NativeModulesApple", "React_NativeModulesApple", []))
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-bridging", "React_bridging", []))
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"]))
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-featureflags", "React_featureflags", []))
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-renderercss", "React_renderercss", []))
Expand Down
4 changes: 2 additions & 2 deletions ...t-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ Pod::Spec.new do |s|
s.dependency \\"RCTTypeSafety\\"
s.dependency \\"React-Core\\"
s.dependency \\"React-jsi\\"
s.dependency \\"ReactCommon/turbomodule/bridging\\"
s.dependency \\"React-bridging\\"
s.dependency \\"ReactCommon/turbomodule/core\\"
s.dependency \\"React-NativeModulesApple\\"
s.dependency 'React-graphics'
Expand Down Expand Up @@ -948,7 +948,7 @@ Pod::Spec.new do |s|
s.dependency \\"RCTTypeSafety\\"
s.dependency \\"React-Core\\"
s.dependency \\"React-jsi\\"
s.dependency \\"ReactCommon/turbomodule/bridging\\"
s.dependency \\"React-bridging\\"
s.dependency \\"ReactCommon/turbomodule/core\\"
s.dependency \\"React-NativeModulesApple\\"
s.dependency 'React-graphics'
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Pod::Spec.new do |s|
s.dependency "RCTTypeSafety"
s.dependency "React-Core"
s.dependency "React-jsi"
s.dependency "ReactCommon/turbomodule/bridging"
s.dependency "React-bridging"
s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-NativeModulesApple"
s.dependency 'React-graphics'
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/scripts/react_native_pods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def use_react_native! (
pod 'React-domnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/dom"
pod 'React-defaultsnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/defaults"
pod 'React-Mapbuffer', :path => "#{prefix}/ReactCommon"
pod 'React-bridging', :path => "#{prefix}/ReactCommon/react/bridging", :modular_headers => true
pod 'React-jserrorhandler', :path => "#{prefix}/ReactCommon/jserrorhandler"
pod 'RCTDeprecation', :path => "#{prefix}/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
pod 'React-RCTFBReactNativeSpec', :path => "#{prefix}/React"
Expand Down
Loading