Skip to content

Commit 8de8e08

Browse files
coadometa-codesync[bot]
coado
authored and
meta-codesync[bot]
committed
Reland Bridging umbrella in generated modules (#58558)
Summary: Pull Request resolved: #58558 Generate TurboModule interfaces using the public Bridging C++ entry point so generated consumers remain compatible with the strict API boundary. Export the bridging module include root from its CMake target so source-built consumers can resolve <React/Bridging.h>. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D120357994 fbshipit-source-id: 072d67197daf19acffbb66c110833a10a7094cfb
1 parent b439ef7 commit 8de8e08

4 files changed

Lines changed: 17 additions & 16 deletions

File tree

‎packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exports[`GenerateModuleH can generate a header file NativeModule specs 1`] = `
1313
#pragma once
1414

1515
#include <ReactCommon/TurboModule.h>
16-
#include <react/bridging/Bridging.h>
16+
#include <React/Bridging.h>
1717

1818
namespace facebook::react {
1919

@@ -1610,7 +1610,7 @@ exports[`GenerateModuleH can generate a header file NativeModule specs with assu
16101610
#pragma once
16111611

16121612
#include <ReactCommon/TurboModule.h>
1613-
#include <react/bridging/Bridging.h>
1613+
#include <React/Bridging.h>
16141614

16151615
namespace facebook::react {
16161616

‎packages/react-native-codegen/src/generators/modules/GenerateModuleH.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ const FileTemplate = ({
213213
#pragma once
214214
215215
#include <ReactCommon/TurboModule.h>
216-
#include <react/bridging/Bridging.h>
216+
#include <React/Bridging.h>
217217
218218
namespace facebook::react {
219219

‎packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Map {
1414
#pragma once
1515

1616
#include <ReactCommon/TurboModule.h>
17-
#include <react/bridging/Bridging.h>
17+
#include <React/Bridging.h>
1818

1919
namespace facebook::react {
2020

@@ -52,7 +52,7 @@ Map {
5252
#pragma once
5353

5454
#include <ReactCommon/TurboModule.h>
55-
#include <react/bridging/Bridging.h>
55+
#include <React/Bridging.h>
5656

5757
namespace facebook::react {
5858

@@ -113,7 +113,7 @@ Map {
113113
#pragma once
114114

115115
#include <ReactCommon/TurboModule.h>
116-
#include <react/bridging/Bridging.h>
116+
#include <React/Bridging.h>
117117

118118
namespace facebook::react {
119119

@@ -156,7 +156,7 @@ Map {
156156
#pragma once
157157

158158
#include <ReactCommon/TurboModule.h>
159-
#include <react/bridging/Bridging.h>
159+
#include <React/Bridging.h>
160160

161161
namespace facebook::react {
162162

@@ -253,7 +253,7 @@ Map {
253253
#pragma once
254254

255255
#include <ReactCommon/TurboModule.h>
256-
#include <react/bridging/Bridging.h>
256+
#include <React/Bridging.h>
257257

258258
namespace facebook::react {
259259

@@ -972,7 +972,7 @@ Map {
972972
#pragma once
973973

974974
#include <ReactCommon/TurboModule.h>
975-
#include <react/bridging/Bridging.h>
975+
#include <React/Bridging.h>
976976

977977
namespace facebook::react {
978978

@@ -1010,7 +1010,7 @@ Map {
10101010
#pragma once
10111011

10121012
#include <ReactCommon/TurboModule.h>
1013-
#include <react/bridging/Bridging.h>
1013+
#include <React/Bridging.h>
10141014

10151015
namespace facebook::react {
10161016

@@ -1175,7 +1175,7 @@ Map {
11751175
#pragma once
11761176

11771177
#include <ReactCommon/TurboModule.h>
1178-
#include <react/bridging/Bridging.h>
1178+
#include <React/Bridging.h>
11791179

11801180
namespace facebook::react {
11811181

@@ -1297,7 +1297,7 @@ Map {
12971297
#pragma once
12981298

12991299
#include <ReactCommon/TurboModule.h>
1300-
#include <react/bridging/Bridging.h>
1300+
#include <React/Bridging.h>
13011301

13021302
namespace facebook::react {
13031303

@@ -1834,7 +1834,7 @@ Map {
18341834
#pragma once
18351835

18361836
#include <ReactCommon/TurboModule.h>
1837-
#include <react/bridging/Bridging.h>
1837+
#include <React/Bridging.h>
18381838

18391839
namespace facebook::react {
18401840

@@ -2050,7 +2050,7 @@ Map {
20502050
#pragma once
20512051

20522052
#include <ReactCommon/TurboModule.h>
2053-
#include <react/bridging/Bridging.h>
2053+
#include <React/Bridging.h>
20542054

20552055
namespace facebook::react {
20562056

@@ -2101,7 +2101,7 @@ Map {
21012101
#pragma once
21022102

21032103
#include <ReactCommon/TurboModule.h>
2104-
#include <react/bridging/Bridging.h>
2104+
#include <React/Bridging.h>
21052105

21062106
namespace facebook::react {
21072107

@@ -2172,7 +2172,7 @@ Map {
21722172
#pragma once
21732173

21742174
#include <ReactCommon/TurboModule.h>
2175-
#include <react/bridging/Bridging.h>
2175+
#include <React/Bridging.h>
21762176

21772177
namespace facebook::react {
21782178

‎packages/react-native/ReactCommon/react/bridging/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ file(GLOB react_bridging_SRC CONFIGURE_DEPENDS *.cpp)
1313
add_library(react_bridging OBJECT ${react_bridging_SRC})
1414

1515
target_include_directories(react_bridging PUBLIC ${REACT_COMMON_DIR})
16+
target_include_directories(react_bridging INTERFACE ${REACT_COMMON_DIR}/react/bridging)
1617

1718
target_link_libraries(react_bridging jsi callinvoker react_cxxstableapi react_timing)
1819
target_compile_reactnative_options(react_bridging PRIVATE)

0 commit comments

Comments
 (0)