Skip to content

Commit 3e12c04

Browse files
coadofacebook-github-bot
authored andcommitted
Use ComponentRegistry umbrella in generated descriptors (#58554)
Summary: Generate component descriptor headers through the public <React/ComponentRegistry.h> umbrella instead of directly including ComponentDescriptorProviderRegistry.h. Refresh codegen snapshots and the checked-in popup-menu binding, and export the ComponentRegistry dependency needed by that public generated header. Changelog: [Internal]. Reviewed By: cipolleschi Differential Revision: D120317127
1 parent 4239f64 commit 3e12c04

5 files changed

Lines changed: 76 additions & 76 deletions

File tree

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
@@ -15,8 +15,8 @@ Object {
1515
#pragma once
1616
1717
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
18+
#include <React/ComponentRegistry.h>
1819
#include <react/renderer/core/ConcreteComponentDescriptor.h>
19-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
2020
2121
namespace facebook::react {
2222
@@ -45,8 +45,8 @@ Object {
4545
#pragma once
4646
4747
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
48+
#include <React/ComponentRegistry.h>
4849
#include <react/renderer/core/ConcreteComponentDescriptor.h>
49-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
5050
5151
namespace facebook::react {
5252
@@ -75,8 +75,8 @@ Object {
7575
#pragma once
7676
7777
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
78+
#include <React/ComponentRegistry.h>
7879
#include <react/renderer/core/ConcreteComponentDescriptor.h>
79-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
8080
8181
namespace facebook::react {
8282
@@ -105,8 +105,8 @@ Object {
105105
#pragma once
106106
107107
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
108+
#include <React/ComponentRegistry.h>
108109
#include <react/renderer/core/ConcreteComponentDescriptor.h>
109-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
110110
111111
namespace facebook::react {
112112
@@ -135,8 +135,8 @@ Object {
135135
#pragma once
136136
137137
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
138+
#include <React/ComponentRegistry.h>
138139
#include <react/renderer/core/ConcreteComponentDescriptor.h>
139-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
140140
141141
namespace facebook::react {
142142
@@ -165,8 +165,8 @@ Object {
165165
#pragma once
166166
167167
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
168+
#include <React/ComponentRegistry.h>
168169
#include <react/renderer/core/ConcreteComponentDescriptor.h>
169-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
170170
171171
namespace facebook::react {
172172
@@ -195,8 +195,8 @@ Object {
195195
#pragma once
196196
197197
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
198+
#include <React/ComponentRegistry.h>
198199
#include <react/renderer/core/ConcreteComponentDescriptor.h>
199-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
200200
201201
namespace facebook::react {
202202
@@ -225,8 +225,8 @@ Object {
225225
#pragma once
226226
227227
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
228+
#include <React/ComponentRegistry.h>
228229
#include <react/renderer/core/ConcreteComponentDescriptor.h>
229-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
230230
231231
namespace facebook::react {
232232
@@ -255,8 +255,8 @@ Object {
255255
#pragma once
256256
257257
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
258+
#include <React/ComponentRegistry.h>
258259
#include <react/renderer/core/ConcreteComponentDescriptor.h>
259-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
260260
261261
namespace facebook::react {
262262
@@ -285,8 +285,8 @@ Object {
285285
#pragma once
286286
287287
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
288+
#include <React/ComponentRegistry.h>
288289
#include <react/renderer/core/ConcreteComponentDescriptor.h>
289-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
290290
291291
namespace facebook::react {
292292
@@ -315,8 +315,8 @@ Object {
315315
#pragma once
316316
317317
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
318+
#include <React/ComponentRegistry.h>
318319
#include <react/renderer/core/ConcreteComponentDescriptor.h>
319-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
320320
321321
namespace facebook::react {
322322
@@ -345,8 +345,8 @@ Object {
345345
#pragma once
346346
347347
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
348+
#include <React/ComponentRegistry.h>
348349
#include <react/renderer/core/ConcreteComponentDescriptor.h>
349-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
350350
351351
namespace facebook::react {
352352
@@ -375,8 +375,8 @@ Object {
375375
#pragma once
376376
377377
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
378+
#include <React/ComponentRegistry.h>
378379
#include <react/renderer/core/ConcreteComponentDescriptor.h>
379-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
380380
381381
namespace facebook::react {
382382
@@ -405,8 +405,8 @@ Object {
405405
#pragma once
406406
407407
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
408+
#include <React/ComponentRegistry.h>
408409
#include <react/renderer/core/ConcreteComponentDescriptor.h>
409-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
410410
411411
namespace facebook::react {
412412
@@ -435,8 +435,8 @@ Object {
435435
#pragma once
436436
437437
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
438+
#include <React/ComponentRegistry.h>
438439
#include <react/renderer/core/ConcreteComponentDescriptor.h>
439-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
440440
441441
namespace facebook::react {
442442
@@ -465,8 +465,8 @@ Object {
465465
#pragma once
466466
467467
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
468+
#include <React/ComponentRegistry.h>
468469
#include <react/renderer/core/ConcreteComponentDescriptor.h>
469-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
470470
471471
namespace facebook::react {
472472
@@ -495,8 +495,8 @@ Object {
495495
#pragma once
496496
497497
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
498+
#include <React/ComponentRegistry.h>
498499
#include <react/renderer/core/ConcreteComponentDescriptor.h>
499-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
500500
501501
namespace facebook::react {
502502
@@ -525,8 +525,8 @@ Object {
525525
#pragma once
526526
527527
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
528+
#include <React/ComponentRegistry.h>
528529
#include <react/renderer/core/ConcreteComponentDescriptor.h>
529-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
530530
531531
namespace facebook::react {
532532

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Object {
1515
#pragma once
1616
1717
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
18+
#include <React/ComponentRegistry.h>
1819
#include <react/renderer/core/ConcreteComponentDescriptor.h>
19-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
2020
2121
namespace facebook::react {
2222
@@ -45,8 +45,8 @@ Object {
4545
#pragma once
4646
4747
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
48+
#include <React/ComponentRegistry.h>
4849
#include <react/renderer/core/ConcreteComponentDescriptor.h>
49-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
5050
5151
namespace facebook::react {
5252
@@ -75,8 +75,8 @@ Object {
7575
#pragma once
7676
7777
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
78+
#include <React/ComponentRegistry.h>
7879
#include <react/renderer/core/ConcreteComponentDescriptor.h>
79-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
8080
8181
namespace facebook::react {
8282
@@ -105,8 +105,8 @@ Object {
105105
#pragma once
106106
107107
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
108+
#include <React/ComponentRegistry.h>
108109
#include <react/renderer/core/ConcreteComponentDescriptor.h>
109-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
110110
111111
namespace facebook::react {
112112
@@ -135,8 +135,8 @@ Object {
135135
#pragma once
136136
137137
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
138+
#include <React/ComponentRegistry.h>
138139
#include <react/renderer/core/ConcreteComponentDescriptor.h>
139-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
140140
141141
namespace facebook::react {
142142
@@ -165,8 +165,8 @@ Object {
165165
#pragma once
166166
167167
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
168+
#include <React/ComponentRegistry.h>
168169
#include <react/renderer/core/ConcreteComponentDescriptor.h>
169-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
170170
171171
namespace facebook::react {
172172
@@ -195,8 +195,8 @@ Object {
195195
#pragma once
196196
197197
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
198+
#include <React/ComponentRegistry.h>
198199
#include <react/renderer/core/ConcreteComponentDescriptor.h>
199-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
200200
201201
namespace facebook::react {
202202
@@ -225,8 +225,8 @@ Object {
225225
#pragma once
226226
227227
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
228+
#include <React/ComponentRegistry.h>
228229
#include <react/renderer/core/ConcreteComponentDescriptor.h>
229-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
230230
231231
namespace facebook::react {
232232
@@ -255,8 +255,8 @@ Object {
255255
#pragma once
256256
257257
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
258+
#include <React/ComponentRegistry.h>
258259
#include <react/renderer/core/ConcreteComponentDescriptor.h>
259-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
260260
261261
namespace facebook::react {
262262
@@ -285,8 +285,8 @@ Object {
285285
#pragma once
286286
287287
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
288+
#include <React/ComponentRegistry.h>
288289
#include <react/renderer/core/ConcreteComponentDescriptor.h>
289-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
290290
291291
namespace facebook::react {
292292
@@ -315,8 +315,8 @@ Object {
315315
#pragma once
316316
317317
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
318+
#include <React/ComponentRegistry.h>
318319
#include <react/renderer/core/ConcreteComponentDescriptor.h>
319-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
320320
321321
namespace facebook::react {
322322
@@ -345,8 +345,8 @@ Object {
345345
#pragma once
346346
347347
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
348+
#include <React/ComponentRegistry.h>
348349
#include <react/renderer/core/ConcreteComponentDescriptor.h>
349-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
350350
351351
namespace facebook::react {
352352
@@ -375,8 +375,8 @@ Object {
375375
#pragma once
376376
377377
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
378+
#include <React/ComponentRegistry.h>
378379
#include <react/renderer/core/ConcreteComponentDescriptor.h>
379-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
380380
381381
namespace facebook::react {
382382
@@ -405,8 +405,8 @@ Object {
405405
#pragma once
406406
407407
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
408+
#include <React/ComponentRegistry.h>
408409
#include <react/renderer/core/ConcreteComponentDescriptor.h>
409-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
410410
411411
namespace facebook::react {
412412
@@ -435,8 +435,8 @@ Object {
435435
#pragma once
436436
437437
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
438+
#include <React/ComponentRegistry.h>
438439
#include <react/renderer/core/ConcreteComponentDescriptor.h>
439-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
440440
441441
namespace facebook::react {
442442
@@ -465,8 +465,8 @@ Object {
465465
#pragma once
466466
467467
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
468+
#include <React/ComponentRegistry.h>
468469
#include <react/renderer/core/ConcreteComponentDescriptor.h>
469-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
470470
471471
namespace facebook::react {
472472
@@ -495,8 +495,8 @@ Object {
495495
#pragma once
496496
497497
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
498+
#include <React/ComponentRegistry.h>
498499
#include <react/renderer/core/ConcreteComponentDescriptor.h>
499-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
500500
501501
namespace facebook::react {
502502
@@ -525,8 +525,8 @@ Object {
525525
#pragma once
526526
527527
#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
528+
#include <React/ComponentRegistry.h>
528529
#include <react/renderer/core/ConcreteComponentDescriptor.h>
529-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
530530
531531
namespace facebook::react {
532532

packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ const FileTemplate = ({
3838
#pragma once
3939
4040
${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})}
41+
#include <React/ComponentRegistry.h>
4142
#include <react/renderer/core/ConcreteComponentDescriptor.h>
42-
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
4343
4444
namespace facebook::react {
4545

0 commit comments

Comments
 (0)