Skip to content

Commit 91c8bbb

Browse files
j-piaseckifacebook-github-bot
j-piasecki
authored and
facebook-github-bot
committed
Emit umbrella header includes from codegen
Summary: Codegen output is compiled in consumer targets, so it now includes React Native through module umbrella headers (`<React/RendererCore.h>`, `<React/Graphics.h>`, `<React/NativeModuleCore.h>`, etc.) instead of fine-grained paths, which hard-error under `RN_STRICT_API`. Changelog: [General][Changed] - Codegen-generated C++ includes React Native through module umbrella headers Differential Revision: D122317911
1 parent 9b131e4 commit 91c8bbb

25 files changed

Lines changed: 536 additions & 845 deletions

‎packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Object {
1616
1717
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
1818
#include <React/ComponentRegistry.h>
19-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
19+
#include <React/RendererCore.h>
2020
2121
namespace facebook::react {
2222
@@ -46,7 +46,7 @@ Object {
4646
4747
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
4848
#include <React/ComponentRegistry.h>
49-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
49+
#include <React/RendererCore.h>
5050
5151
namespace facebook::react {
5252
@@ -76,7 +76,7 @@ Object {
7676
7777
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
7878
#include <React/ComponentRegistry.h>
79-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
79+
#include <React/RendererCore.h>
8080
8181
namespace facebook::react {
8282
@@ -106,7 +106,7 @@ Object {
106106
107107
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
108108
#include <React/ComponentRegistry.h>
109-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
109+
#include <React/RendererCore.h>
110110
111111
namespace facebook::react {
112112
@@ -136,7 +136,7 @@ Object {
136136
137137
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
138138
#include <React/ComponentRegistry.h>
139-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
139+
#include <React/RendererCore.h>
140140
141141
namespace facebook::react {
142142
@@ -166,7 +166,7 @@ Object {
166166
167167
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
168168
#include <React/ComponentRegistry.h>
169-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
169+
#include <React/RendererCore.h>
170170
171171
namespace facebook::react {
172172
@@ -196,7 +196,7 @@ Object {
196196
197197
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
198198
#include <React/ComponentRegistry.h>
199-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
199+
#include <React/RendererCore.h>
200200
201201
namespace facebook::react {
202202
@@ -226,7 +226,7 @@ Object {
226226
227227
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
228228
#include <React/ComponentRegistry.h>
229-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
229+
#include <React/RendererCore.h>
230230
231231
namespace facebook::react {
232232
@@ -256,7 +256,7 @@ Object {
256256
257257
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
258258
#include <React/ComponentRegistry.h>
259-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
259+
#include <React/RendererCore.h>
260260
261261
namespace facebook::react {
262262
@@ -286,7 +286,7 @@ Object {
286286
287287
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
288288
#include <React/ComponentRegistry.h>
289-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
289+
#include <React/RendererCore.h>
290290
291291
namespace facebook::react {
292292
@@ -316,7 +316,7 @@ Object {
316316
317317
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
318318
#include <React/ComponentRegistry.h>
319-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
319+
#include <React/RendererCore.h>
320320
321321
namespace facebook::react {
322322
@@ -346,7 +346,7 @@ Object {
346346
347347
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
348348
#include <React/ComponentRegistry.h>
349-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
349+
#include <React/RendererCore.h>
350350
351351
namespace facebook::react {
352352
@@ -376,7 +376,7 @@ Object {
376376
377377
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
378378
#include <React/ComponentRegistry.h>
379-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
379+
#include <React/RendererCore.h>
380380
381381
namespace facebook::react {
382382
@@ -406,7 +406,7 @@ Object {
406406
407407
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
408408
#include <React/ComponentRegistry.h>
409-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
409+
#include <React/RendererCore.h>
410410
411411
namespace facebook::react {
412412
@@ -436,7 +436,7 @@ Object {
436436
437437
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
438438
#include <React/ComponentRegistry.h>
439-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
439+
#include <React/RendererCore.h>
440440
441441
namespace facebook::react {
442442
@@ -466,7 +466,7 @@ Object {
466466
467467
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
468468
#include <React/ComponentRegistry.h>
469-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
469+
#include <React/RendererCore.h>
470470
471471
namespace facebook::react {
472472
@@ -496,7 +496,7 @@ Object {
496496
497497
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
498498
#include <React/ComponentRegistry.h>
499-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
499+
#include <React/RendererCore.h>
500500
501501
namespace facebook::react {
502502
@@ -526,7 +526,7 @@ Object {
526526
527527
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
528528
#include <React/ComponentRegistry.h>
529-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
529+
#include <React/RendererCore.h>
530530
531531
namespace facebook::react {
532532

‎packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap‎

Lines changed: 22 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ Object {
1313
*/
1414
1515
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
16+
#include <React/Image.h>
17+
#include <React/RendererCore.h>
1618
#include <React/View.h>
17-
#include <react/renderer/components/image/conversions.h>
18-
#include <react/renderer/core/PropsParserContext.h>
19-
#include <react/renderer/core/propsConversions.h>
2019
2120
namespace facebook::react {
2221
@@ -128,8 +127,7 @@ Object {
128127
*/
129128
130129
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
131-
#include <react/renderer/core/PropsParserContext.h>
132-
#include <react/renderer/core/propsConversions.h>
130+
#include <React/RendererCore.h>
133131
134132
namespace facebook::react {
135133
@@ -186,8 +184,7 @@ Object {
186184
*/
187185
188186
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
189-
#include <react/renderer/core/PropsParserContext.h>
190-
#include <react/renderer/core/propsConversions.h>
187+
#include <React/RendererCore.h>
191188
192189
namespace facebook::react {
193190
@@ -239,9 +236,8 @@ Object {
239236
*/
240237
241238
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
239+
#include <React/RendererCore.h>
242240
#include <React/View.h>
243-
#include <react/renderer/core/PropsParserContext.h>
244-
#include <react/renderer/core/propsConversions.h>
245241
246242
namespace facebook::react {
247243
@@ -293,8 +289,7 @@ Object {
293289
*/
294290
295291
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
296-
#include <react/renderer/core/PropsParserContext.h>
297-
#include <react/renderer/core/propsConversions.h>
292+
#include <React/RendererCore.h>
298293
299294
namespace facebook::react {
300295
@@ -343,8 +338,7 @@ Object {
343338
*/
344339
345340
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
346-
#include <react/renderer/core/PropsParserContext.h>
347-
#include <react/renderer/core/propsConversions.h>
341+
#include <React/RendererCore.h>
348342
349343
namespace facebook::react {
350344
@@ -401,8 +395,7 @@ Object {
401395
*/
402396
403397
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
404-
#include <react/renderer/core/PropsParserContext.h>
405-
#include <react/renderer/core/propsConversions.h>
398+
#include <React/RendererCore.h>
406399
407400
namespace facebook::react {
408401
@@ -454,8 +447,7 @@ Object {
454447
*/
455448
456449
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
457-
#include <react/renderer/core/PropsParserContext.h>
458-
#include <react/renderer/core/propsConversions.h>
450+
#include <React/RendererCore.h>
459451
460452
namespace facebook::react {
461453
@@ -507,8 +499,7 @@ Object {
507499
*/
508500
509501
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
510-
#include <react/renderer/core/PropsParserContext.h>
511-
#include <react/renderer/core/propsConversions.h>
502+
#include <React/RendererCore.h>
512503
513504
namespace facebook::react {
514505
@@ -590,9 +581,8 @@ Object {
590581
*/
591582
592583
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
593-
#include <react/renderer/components/image/conversions.h>
594-
#include <react/renderer/core/PropsParserContext.h>
595-
#include <react/renderer/core/propsConversions.h>
584+
#include <React/Image.h>
585+
#include <React/RendererCore.h>
596586
597587
namespace facebook::react {
598588
@@ -644,8 +634,7 @@ Object {
644634
*/
645635
646636
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
647-
#include <react/renderer/core/PropsParserContext.h>
648-
#include <react/renderer/core/propsConversions.h>
637+
#include <React/RendererCore.h>
649638
650639
namespace facebook::react {
651640
@@ -707,8 +696,7 @@ Object {
707696
*/
708697
709698
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
710-
#include <react/renderer/core/PropsParserContext.h>
711-
#include <react/renderer/core/propsConversions.h>
699+
#include <React/RendererCore.h>
712700
713701
namespace facebook::react {
714702
@@ -760,9 +748,8 @@ Object {
760748
*/
761749
762750
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
751+
#include <React/RendererCore.h>
763752
#include <folly/dynamic.h>
764-
#include <react/renderer/core/PropsParserContext.h>
765-
#include <react/renderer/core/propsConversions.h>
766753
767754
namespace facebook::react {
768755
@@ -814,9 +801,8 @@ Object {
814801
*/
815802
816803
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
817-
#include <react/renderer/components/image/conversions.h>
818-
#include <react/renderer/core/PropsParserContext.h>
819-
#include <react/renderer/core/propsConversions.h>
804+
#include <React/Image.h>
805+
#include <React/RendererCore.h>
820806
821807
namespace facebook::react {
822808
@@ -883,8 +869,7 @@ Object {
883869
*/
884870
885871
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
886-
#include <react/renderer/core/PropsParserContext.h>
887-
#include <react/renderer/core/propsConversions.h>
872+
#include <React/RendererCore.h>
888873
889874
namespace facebook::react {
890875
@@ -933,9 +918,8 @@ Object {
933918
*/
934919
935920
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
936-
#include <react/renderer/components/image/conversions.h>
937-
#include <react/renderer/core/PropsParserContext.h>
938-
#include <react/renderer/core/propsConversions.h>
921+
#include <React/Image.h>
922+
#include <React/RendererCore.h>
939923
940924
namespace facebook::react {
941925
@@ -997,8 +981,7 @@ Object {
997981
*/
998982
999983
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
1000-
#include <react/renderer/core/PropsParserContext.h>
1001-
#include <react/renderer/core/propsConversions.h>
984+
#include <React/RendererCore.h>
1002985
1003986
namespace facebook::react {
1004987
@@ -1050,8 +1033,7 @@ Object {
10501033
*/
10511034
10521035
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
1053-
#include <react/renderer/core/PropsParserContext.h>
1054-
#include <react/renderer/core/propsConversions.h>
1036+
#include <React/RendererCore.h>
10551037
10561038
namespace facebook::react {
10571039

0 commit comments

Comments
 (0)