Skip to content

Use umbrellas instead of direct includes in rendererdebug module (#58619) #58619

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

Closed
j-piasecki wants to merge 2 commits into from
Closed

Use umbrellas instead of direct includes in rendererdebug module (#58619) #58619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c58ed3e
Fix formatting in iOS prebuild header docs
cortinico Sep 25, 2026
17917d1
Use umbrellas instead of direct includes in rendererdebug module (#58…
j-piasecki Sep 25, 2026
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
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ add_library(react_renderer_debug OBJECT ${react_renderer_debug_SRC})

target_include_directories(react_renderer_debug PUBLIC ${REACT_COMMON_DIR})
target_include_directories(react_renderer_debug INTERFACE ${REACT_COMMON_DIR}/react/renderer/debug)
target_link_libraries(react_renderer_debug folly_runtime react_cxxstableapi react_debug)
target_link_libraries(react_renderer_debug folly_runtime react_cxxstableapi react_debug react_utils)
target_compile_reactnative_options(react_renderer_debug PRIVATE)
target_compile_options(react_renderer_debug PRIVATE -Wpedantic)

Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Pod::Spec.new do |s|
resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_rendererdebug")

add_dependency(s, "React-debug")
add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
add_rn_third_party_dependencies(s)
add_rncore_dependency(s)

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#include <optional>
#include <string>

#include <React/Utils.h>
#include <react/renderer/debug/DebugStringConvertible.h>
#include <react/renderer/debug/DebugStringConvertibleItem.h>
#include <react/utils/FloatComparison.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/debug/flags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/debug/flags.h>
#include <React/Debug.h>

//
// This file contains flags that should __never__ be enabled for
Expand Down
9 changes: 7 additions & 2 deletions packages/react-native/ReactCommon/react/utils/React-utils.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ else
end

Pod::Spec.new do |s|
source_files = ["*.{m,mm,cpp,h}", "platform/ios/**/*.{m,mm,cpp,h}"]
source_files = ["*.{m,mm,cpp,h}"]
header_search_paths = [
"\"$(PODS_TARGET_SRCROOT)/../../\"",
]
Expand All @@ -30,7 +30,7 @@ Pod::Spec.new do |s|
s.author = "Meta Platforms, Inc. and its affiliates"
s.platforms = min_supported_versions
s.source = source
s.source_files = podspec_sources(source_files, ["*.h", "platform/ios/**/*.h"])
s.source_files = podspec_sources(source_files, ["*.h"])
s.header_dir = "react/utils"
s.exclude_files = ["tests", "React"]

Expand All @@ -56,6 +56,11 @@ Pod::Spec.new do |s|

add_dependency(s, "React-debug")

s.subspec "platformios" do |ss|
ss.source_files = podspec_sources("platform/ios/**/*.{m,mm,cpp,h}", "platform/ios/**/*.h")
ss.header_mappings_dir = "platform/ios"
end

s.subspec "utilsUmbrella" do |ss|
ss.source_files = "React/*.h"
ss.header_dir = ""
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/scripts/ios-prebuild/__docs__/headers-rules.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ of module `React`, closing a cycle:
React -> ReactNativeHeaders_react -> React
```

Found empirically: `react/timing/primitives.h` -> `<React/Debug.h>`. This is
the same two-module-ownership failure as `UMBRELLA_CXX_GUARDED_EXCLUSIONS`
Found empirically: `react/timing/primitives.h` -> `<React/Debug.h>`. This is the
same two-module-ownership failure as `UMBRELLA_CXX_GUARDED_EXCLUSIONS`
(`RCTFrameTimingsObserver.h`, which reaches the same `primitives.h`), in the
opposite direction. They are `objc-blocked` by construction (they re-export
their module's C++ surface), so they were never R4 umbrella or R5 module
Expand Down
Loading