From b366b4b42e0f91eb2b1850c404fadd0f0322fc61 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 13 Feb 2024 07:27:54 -0800 Subject: [PATCH] Back out "Fix autolinking for local app Fabric components" Summary: Original commit changeset: 28c376fbd08c Original Phabricator Diff: D53661231 Reviewed By: cipolleschi Differential Revision: D53709386 fbshipit-source-id: aab2d99327460cc82591f7de5e6e0296f7695cd6 --- .../GenerateComponentDescriptorH-test.js.snap | 72 -- .../src/generators/RNCodegen.d.ts | 1 - .../src/generators/RNCodegen.js | 4 - .../GenerateComponentDescriptorCpp.js | 103 --- .../GenerateComponentDescriptorH.js | 21 +- .../GenerateComponentDescriptorCpp-test.js | 35 - ...enerateComponentDescriptorCpp-test.js.snap | 874 ------------------ .../GenerateComponentDescriptorH-test.js.snap | 116 --- .../cmake-utils/ReactNative-application.cmake | 2 - .../cmake-utils/default-app-setup/OnLoad.cpp | 10 +- .../android/app/src/main/jni/OnLoad.cpp | 11 +- 11 files changed, 13 insertions(+), 1236 deletions(-) delete mode 100644 packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorCpp.js delete mode 100644 packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorCpp-test.js delete mode 100644 packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorCpp-test.js.snap diff --git a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap index 46757e6c95c..e989a3b2eca 100644 --- a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap +++ b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap @@ -16,15 +16,11 @@ Object { #include #include -#include namespace facebook::react { using ArrayPropsNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -46,15 +42,11 @@ Object { #include #include -#include namespace facebook::react { using BooleanPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -76,15 +68,11 @@ Object { #include #include -#include namespace facebook::react { using ColorPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -106,15 +94,11 @@ Object { #include #include -#include namespace facebook::react { using DimensionPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -136,15 +120,11 @@ Object { #include #include -#include namespace facebook::react { using EdgeInsetsPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -166,15 +146,11 @@ Object { #include #include -#include namespace facebook::react { using EnumPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -196,15 +172,11 @@ Object { #include #include -#include namespace facebook::react { using EventNestedObjectPropsNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -226,15 +198,11 @@ Object { #include #include -#include namespace facebook::react { using EventPropsNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -256,15 +224,11 @@ Object { #include #include -#include namespace facebook::react { using FloatPropsNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -286,15 +250,11 @@ Object { #include #include -#include namespace facebook::react { using ImagePropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -316,15 +276,11 @@ Object { #include #include -#include namespace facebook::react { using IntegerPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -346,15 +302,11 @@ Object { #include #include -#include namespace facebook::react { -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -376,15 +328,11 @@ Object { #include #include -#include namespace facebook::react { using MixedPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -406,15 +354,11 @@ Object { #include #include -#include namespace facebook::react { using MultiNativePropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -436,15 +380,11 @@ Object { #include #include -#include namespace facebook::react { using NoPropsNoEventsNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -466,15 +406,11 @@ Object { #include #include -#include namespace facebook::react { using ObjectPropsNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -496,15 +432,11 @@ Object { #include #include -#include namespace facebook::react { using PointPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -526,15 +458,11 @@ Object { #include #include -#include namespace facebook::react { using StringPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor; -void RNCodegenModuleFixtures_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } diff --git a/packages/react-native-codegen/src/generators/RNCodegen.d.ts b/packages/react-native-codegen/src/generators/RNCodegen.d.ts index f73eb2e0fa5..9cf647abfcc 100644 --- a/packages/react-native-codegen/src/generators/RNCodegen.d.ts +++ b/packages/react-native-codegen/src/generators/RNCodegen.d.ts @@ -14,7 +14,6 @@ export type ViewGeneratorFunction = (libraryName: string, schema: SchemaType) => type LibraryGeneratorNames = | 'generateComponentDescriptorH' - | 'generateComponentDescriptorCpp' | 'generateComponentHObjCpp' | 'generateEventEmitterCpp' | 'generateEventEmitterH' diff --git a/packages/react-native-codegen/src/generators/RNCodegen.js b/packages/react-native-codegen/src/generators/RNCodegen.js index d363ceb0957..5b7297f2ac0 100644 --- a/packages/react-native-codegen/src/generators/RNCodegen.js +++ b/packages/react-native-codegen/src/generators/RNCodegen.js @@ -19,7 +19,6 @@ TODO: import type {SchemaType} from '../CodegenSchema'; const schemaValidator = require('../SchemaValidator.js'); -const generateComponentDescriptorCpp = require('./components/GenerateComponentDescriptorCpp.js'); const generateComponentDescriptorH = require('./components/GenerateComponentDescriptorH.js'); const generateComponentHObjCpp = require('./components/GenerateComponentHObjCpp.js'); const generateEventEmitterCpp = require('./components/GenerateEventEmitterCpp.js'); @@ -47,7 +46,6 @@ const path = require('path'); const ALL_GENERATORS = { generateComponentDescriptorH: generateComponentDescriptorH.generate, - generateComponentDescriptorCpp: generateComponentDescriptorCpp.generate, generateComponentHObjCpp: generateComponentHObjCpp.generate, generateEventEmitterCpp: generateEventEmitterCpp.generate, generateEventEmitterH: generateEventEmitterH.generate, @@ -128,7 +126,6 @@ const LIBRARY_GENERATORS = { componentsAndroid: [ // JNI/C++ files generateComponentDescriptorH.generate, - generateComponentDescriptorCpp.generate, generateEventEmitterCpp.generate, generateEventEmitterH.generate, generatePropsCpp.generate, @@ -143,7 +140,6 @@ const LIBRARY_GENERATORS = { ], componentsIOS: [ generateComponentDescriptorH.generate, - generateComponentDescriptorCpp.generate, generateEventEmitterCpp.generate, generateEventEmitterH.generate, generateComponentHObjCpp.generate, diff --git a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorCpp.js b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorCpp.js deleted file mode 100644 index bdb1665348b..00000000000 --- a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorCpp.js +++ /dev/null @@ -1,103 +0,0 @@ -/** - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @flow strict - * @format - */ - -'use strict'; - -import type {SchemaType} from '../../CodegenSchema'; - -const {IncludeTemplate} = require('./CppHelpers'); - -// File path -> contents -type FilesOutput = Map; - -const FileTemplate = ({ - libraryName, - componentRegistrations, - headerPrefix, -}: { - libraryName: string, - componentRegistrations: string, - headerPrefix: string, -}) => ` -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * ${'@'}generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})} -#include -#include - -namespace facebook::react { - -void ${libraryName}_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -${componentRegistrations} -} - -} // namespace facebook::react -`; - -const ComponentRegistrationTemplate = ({className}: {className: string}) => - ` -registry->add(concreteComponentDescriptorProvider<${className}ComponentDescriptor>()); -`.trim(); - -module.exports = { - generate( - libraryName: string, - schema: SchemaType, - packageName?: string, - assumeNonnull: boolean = false, - headerPrefix?: string, - ): FilesOutput { - const fileName = 'ComponentDescriptors.h'; - - const componentRegistrations = Object.keys(schema.modules) - .map(moduleName => { - const module = schema.modules[moduleName]; - if (module.type !== 'Component') { - return; - } - - const {components} = module; - // No components in this module - if (components == null) { - return null; - } - - return Object.keys(components) - .map(componentName => { - if (components[componentName].interfaceOnly === true) { - return; - } - - return ComponentRegistrationTemplate({className: componentName}); - }) - .join('\n'); - }) - .filter(Boolean) - .join('\n'); - - const replacedTemplate = FileTemplate({ - libraryName, - componentRegistrations, - headerPrefix: headerPrefix ?? '', - }); - - return new Map([[fileName, replacedTemplate]]); - }, -}; diff --git a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js index 0a68446cd1a..9bd6e0581cf 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js +++ b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js @@ -18,12 +18,10 @@ const {IncludeTemplate} = require('./CppHelpers'); type FilesOutput = Map; const FileTemplate = ({ - libraryName, - componentDefinitions, + componentDescriptors, headerPrefix, }: { - libraryName: string, - componentDefinitions: string, + componentDescriptors: string, headerPrefix: string, }) => ` /** @@ -39,19 +37,15 @@ const FileTemplate = ({ ${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})} #include -#include namespace facebook::react { -${componentDefinitions} - -void ${libraryName}_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); +${componentDescriptors} } // namespace facebook::react `; -const ComponentDefinitionTemplate = ({className}: {className: string}) => +const ComponentTemplate = ({className}: {className: string}) => ` using ${className}ComponentDescriptor = ConcreteComponentDescriptor<${className}ShadowNode>; `.trim(); @@ -66,7 +60,7 @@ module.exports = { ): FilesOutput { const fileName = 'ComponentDescriptors.h'; - const componentDefinitions = Object.keys(schema.modules) + const componentDescriptors = Object.keys(schema.modules) .map(moduleName => { const module = schema.modules[moduleName]; if (module.type !== 'Component') { @@ -85,7 +79,7 @@ module.exports = { return; } - return ComponentDefinitionTemplate({className: componentName}); + return ComponentTemplate({className: componentName}); }) .join('\n'); }) @@ -93,8 +87,7 @@ module.exports = { .join('\n'); const replacedTemplate = FileTemplate({ - libraryName, - componentDefinitions, + componentDescriptors, headerPrefix: headerPrefix ?? '', }); diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorCpp-test.js deleted file mode 100644 index ebef5169033..00000000000 --- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorCpp-test.js +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @flow strict-local - * @format - * @oncall react_native - */ - -'use strict'; - -const fixtures = require('../__test_fixtures__/fixtures.js'); -const generator = require('../GenerateComponentDescriptorCpp.js'); - -describe('GenerateComponentDescriptorCpp', () => { - Object.keys(fixtures) - .sort() - .forEach(fixtureName => { - const fixture = fixtures[fixtureName]; - - it(`can generate fixture ${fixtureName}`, () => { - expect( - generator.generate( - fixtureName, - fixture, - '', - false, - `react/renderer/components/${fixtureName}/`, - ), - ).toMatchSnapshot(); - }); - }); -}); diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorCpp-test.js.snap deleted file mode 100644 index f6cc87ca9e2..00000000000 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorCpp-test.js.snap +++ /dev/null @@ -1,874 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`GenerateComponentDescriptorCpp can generate fixture ARRAY_PROPS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void ARRAY_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture ARRAY_PROPS_WITH_NESTED_OBJECT 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void ARRAY_PROPS_WITH_NESTED_OBJECT_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture BOOLEAN_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void BOOLEAN_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture COLOR_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void COLOR_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture COMMANDS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void COMMANDS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture COMMANDS_AND_PROPS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void COMMANDS_AND_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture DIMENSION_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void DIMENSION_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture DOUBLE_PROPS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void DOUBLE_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture EVENT_NESTED_OBJECT_PROPS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void EVENT_NESTED_OBJECT_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture EVENT_PROPS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void EVENT_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture EVENTS_WITH_PAPER_NAME 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void EVENTS_WITH_PAPER_NAME_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { - -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture EXCLUDE_ANDROID 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void EXCLUDE_ANDROID_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture EXCLUDE_ANDROID_IOS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void EXCLUDE_ANDROID_IOS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture FLOAT_PROPS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void FLOAT_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture IMAGE_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void IMAGE_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture INSETS_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void INSETS_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture INT32_ENUM_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void INT32_ENUM_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture INTEGER_PROPS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void INTEGER_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture INTERFACE_ONLY 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void INTERFACE_ONLY_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { - -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture MIXED_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void MIXED_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture MULTI_NATIVE_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void MULTI_NATIVE_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture NO_PROPS_NO_EVENTS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void NO_PROPS_NO_EVENTS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture OBJECT_PROPS 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void OBJECT_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture POINT_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void POINT_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture STRING_ENUM_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void STRING_ENUM_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture STRING_PROP 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void STRING_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture TWO_COMPONENTS_DIFFERENT_FILES 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void TWO_COMPONENTS_DIFFERENT_FILES_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; - -exports[`GenerateComponentDescriptorCpp can generate fixture TWO_COMPONENTS_SAME_FILE 1`] = ` -Map { - "ComponentDescriptors.h" => " -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateComponentDescriptorCpp.js - */ - -#pragma once - -#include -#include -#include - -namespace facebook::react { - -void TWO_COMPONENTS_SAME_FILE_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry) { -registry->add(concreteComponentDescriptorProvider()); -registry->add(concreteComponentDescriptorProvider()); -} - -} // namespace facebook::react -", -} -`; diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap index 605f4a21938..7f55bcf5d71 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap @@ -16,15 +16,11 @@ Map { #include #include -#include namespace facebook::react { using ArrayPropsNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void ARRAY_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -46,15 +42,11 @@ Map { #include #include -#include namespace facebook::react { using ArrayPropsNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void ARRAY_PROPS_WITH_NESTED_OBJECT_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -76,15 +68,11 @@ Map { #include #include -#include namespace facebook::react { using BooleanPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void BOOLEAN_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -106,15 +94,11 @@ Map { #include #include -#include namespace facebook::react { using ColorPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void COLOR_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -136,15 +120,11 @@ Map { #include #include -#include namespace facebook::react { using CommandNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void COMMANDS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -166,15 +146,11 @@ Map { #include #include -#include namespace facebook::react { using CommandNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void COMMANDS_AND_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -196,15 +172,11 @@ Map { #include #include -#include namespace facebook::react { using DimensionPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void DIMENSION_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -226,15 +198,11 @@ Map { #include #include -#include namespace facebook::react { using DoublePropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void DOUBLE_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -256,15 +224,11 @@ Map { #include #include -#include namespace facebook::react { using EventsNestedObjectNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void EVENT_NESTED_OBJECT_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -286,15 +250,11 @@ Map { #include #include -#include namespace facebook::react { using EventsNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void EVENT_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -316,15 +276,11 @@ Map { #include #include -#include namespace facebook::react { -void EVENTS_WITH_PAPER_NAME_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -346,15 +302,11 @@ Map { #include #include -#include namespace facebook::react { using ExcludedAndroidComponentComponentDescriptor = ConcreteComponentDescriptor; -void EXCLUDE_ANDROID_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -376,15 +328,11 @@ Map { #include #include -#include namespace facebook::react { using ExcludedAndroidIosComponentComponentDescriptor = ConcreteComponentDescriptor; -void EXCLUDE_ANDROID_IOS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -406,16 +354,12 @@ Map { #include #include -#include namespace facebook::react { using ExcludedIosComponentComponentDescriptor = ConcreteComponentDescriptor; using MultiFileIncludedNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -437,15 +381,11 @@ Map { #include #include -#include namespace facebook::react { using FloatPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void FLOAT_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -467,15 +407,11 @@ Map { #include #include -#include namespace facebook::react { using ImagePropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void IMAGE_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -497,15 +433,11 @@ Map { #include #include -#include namespace facebook::react { using InsetsPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void INSETS_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -527,15 +459,11 @@ Map { #include #include -#include namespace facebook::react { using Int32EnumPropsNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void INT32_ENUM_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -557,15 +485,11 @@ Map { #include #include -#include namespace facebook::react { using IntegerPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void INTEGER_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -587,15 +511,11 @@ Map { #include #include -#include namespace facebook::react { -void INTERFACE_ONLY_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -617,15 +537,11 @@ Map { #include #include -#include namespace facebook::react { using MixedPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void MIXED_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -647,15 +563,11 @@ Map { #include #include -#include namespace facebook::react { using ImageColorPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void MULTI_NATIVE_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -677,15 +589,11 @@ Map { #include #include -#include namespace facebook::react { using NoPropsNoEventsComponentComponentDescriptor = ConcreteComponentDescriptor; -void NO_PROPS_NO_EVENTS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -707,15 +615,11 @@ Map { #include #include -#include namespace facebook::react { using ObjectPropsComponentDescriptor = ConcreteComponentDescriptor; -void OBJECT_PROPS_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -737,15 +641,11 @@ Map { #include #include -#include namespace facebook::react { using PointPropNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void POINT_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -767,15 +667,11 @@ Map { #include #include -#include namespace facebook::react { using StringEnumPropsNativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void STRING_ENUM_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -797,15 +693,11 @@ Map { #include #include -#include namespace facebook::react { using StringPropComponentComponentDescriptor = ConcreteComponentDescriptor; -void STRING_PROP_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -827,16 +719,12 @@ Map { #include #include -#include namespace facebook::react { using MultiFile1NativeComponentComponentDescriptor = ConcreteComponentDescriptor; using MultiFile2NativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void TWO_COMPONENTS_DIFFERENT_FILES_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } @@ -858,16 +746,12 @@ Map { #include #include -#include namespace facebook::react { using MultiComponent1NativeComponentComponentDescriptor = ConcreteComponentDescriptor; using MultiComponent2NativeComponentComponentDescriptor = ConcreteComponentDescriptor; -void TWO_COMPONENTS_SAME_FILE_registerComponentDescriptorsFromCodegen( - std::shared_ptr registry); - } // namespace facebook::react ", } diff --git a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake index 1ad0af8843d..3f2bd1237c5 100644 --- a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake +++ b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake @@ -141,8 +141,6 @@ if(EXISTS ${PROJECT_BUILD_DIR}/generated/source/codegen/jni/CMakeLists.txt) target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -DREACT_NATIVE_APP_CODEGEN_HEADER="${APP_CODEGEN_HEADER}.h" - -DREACT_NATIVE_APP_COMPONENT_DESCRIPTORS_HEADER="react/renderer/components/${APP_CODEGEN_HEADER}/ComponentDescriptors.h" - -DREACT_NATIVE_APP_COMPONENT_REGISTRATION=${APP_CODEGEN_HEADER}_registerComponentDescriptorsFromCodegen -DREACT_NATIVE_APP_MODULE_PROVIDER=${APP_CODEGEN_HEADER}_ModuleProvider ) endif() diff --git a/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp b/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp index d206b123ad4..4452ca8aea6 100644 --- a/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp @@ -36,9 +36,6 @@ #ifdef REACT_NATIVE_APP_CODEGEN_HEADER #include REACT_NATIVE_APP_CODEGEN_HEADER #endif -#ifdef REACT_NATIVE_APP_COMPONENT_DESCRIPTORS_HEADER -#include REACT_NATIVE_APP_COMPONENT_DESCRIPTORS_HEADER -#endif namespace facebook::react { @@ -50,12 +47,7 @@ void registerComponents( // providerRegistry->add(concreteComponentDescriptorProvider< // MyComponentDescriptor>()); - // We link app local components if available -#ifdef REACT_NATIVE_APP_COMPONENT_REGISTRATION - REACT_NATIVE_APP_COMPONENT_REGISTRATION(registry); -#endif - - // And we fallback to the components autolinked by RN CLI + // By default we just use the components autolinked by RN CLI rncli_registerProviders(registry); } diff --git a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp index 7ba52751e28..99f8b74255f 100644 --- a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp +++ b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp @@ -11,22 +11,21 @@ #include #include #include +#include #ifdef REACT_NATIVE_APP_CODEGEN_HEADER #include REACT_NATIVE_APP_CODEGEN_HEADER #endif -#ifdef REACT_NATIVE_APP_COMPONENT_DESCRIPTORS_HEADER -#include REACT_NATIVE_APP_COMPONENT_DESCRIPTORS_HEADER -#endif namespace facebook { namespace react { +extern const char RNTMyNativeViewName[] = "RNTMyLegacyNativeView"; + void registerComponents( std::shared_ptr registry) { -#ifdef REACT_NATIVE_APP_COMPONENT_REGISTRATION - REACT_NATIVE_APP_COMPONENT_REGISTRATION(registry); -#endif + registry->add(concreteComponentDescriptorProvider< + RNTMyNativeViewComponentDescriptor>()); } std::shared_ptr cxxModuleProvider(