Skip to content

Commit 5cd0949

Browse files
j-piaseckimeta-codesync[bot]
authored andcommitted
Upgrade Root visibility to "for frameworks"
Summary: Reclassifies `react/renderer/components/root:root` from public to "for frameworks" under the C++ stable API three-tier visibility model. Consumers that opt into `RN_STRICT_API` now get a suppressible warning where they previously got an error pointing at the umbrella, and can acknowledge it with `RN_ALLOW_FRAMEWORKS`; without that flag the guards are inert, so no existing build changes behaviour. Changelog: [Internal] Differential Revision: D118440376
1 parent 6d73f9c commit 5cd0949

7 files changed

Lines changed: 5 additions & 59 deletions

File tree

packages/react-native/ReactAndroid/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,6 @@ val preparePrefab by
184184
"../ReactCommon/react/renderer/components/root/",
185185
"react/renderer/components/root/",
186186
),
187-
Pair(
188-
"../ReactCommon/react/renderer/components/root/React/",
189-
"React/",
190-
),
191187
// runtimeexecutor
192188
Pair("../ReactCommon/runtimeexecutor/", ""),
193189
// react_renderer_textlayoutmanager

packages/react-native/ReactCommon/React-Fabric.podspec

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,10 @@ Pod::Spec.new do |s|
134134
s.subspec "components" do |ss|
135135
ss.subspec "root" do |sss|
136136
sss.source_files = podspec_sources("react/renderer/components/root/**/*.{m,mm,cpp,h}", "react/renderer/components/root/**/*.{h}")
137-
sss.exclude_files = ["react/renderer/components/root/tests", "react/renderer/components/root/React"]
137+
sss.exclude_files = "react/renderer/components/root/tests"
138138
sss.header_dir = "react/renderer/components/root"
139139
end
140140

141-
ss.subspec "rootUmbrella" do |sss|
142-
sss.source_files = "react/renderer/components/root/React/*.h"
143-
sss.header_dir = ""
144-
sss.header_mappings_dir = "react/renderer/components/root"
145-
end
146-
147141
ss.subspec "view" do |sss|
148142
sss.dependency "React-renderercss"
149143
sss.dependency "Yoga"

packages/react-native/ReactCommon/react/renderer/components/root/React/Root.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <react/renderer/components/root/RootShadowNode.h>
1313
#include <react/renderer/core/ConcreteComponentDescriptor.h>

packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <memory>
1313

packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <memory>
1313

packages/react-native/scripts/ios-prebuild/headers-config.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,9 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
110110
{
111111
name: 'root',
112112
headerPatterns: ['react/renderer/components/root/**/*.h'],
113-
excludePatterns: [
114-
'react/renderer/components/root/tests',
115-
'react/renderer/components/root/React',
116-
],
113+
excludePatterns: ['react/renderer/components/root/tests'],
117114
headerDir: 'react/renderer/components/root',
118115
},
119-
120-
{
121-
name: 'rootUmbrella',
122-
headerPatterns: ['react/renderer/components/root/React/*.h'],
123-
headerDir: 'React',
124-
},
125116
{
126117
name: 'view',
127118
headerPatterns: [

0 commit comments

Comments
 (0)