From 1d89ef87b63e1eb2238a839ef2105a52ac1d2270 Mon Sep 17 00:00:00 2001 From: Kevin Gozali Date: Tue, 29 Sep 2020 18:38:24 -0700 Subject: [PATCH] TurboModule: exclude NativeSampleTurboModule in the schema Summary: The sample module is meant for demo only, but it lives alongside other core modules in react-native repo. For now, exclude it in the Flow-type parsing, just like `NativeUIManager.js` Changelog: [Internal] Reviewed By: hramos Differential Revision: D24005108 fbshipit-source-id: 9ef524bfe2778dd983c94d1701f9ce49da5e0a68 --- .../src/cli/combine/combine-js-to-schema-cli.js | 3 +++ .../app/src/main/jni/RNTesterAppModuleProvider.cpp | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js index f9a0a07d8c..30443a09c3 100644 --- a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js +++ b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js @@ -32,6 +32,9 @@ fileList.forEach(file => { // NativeUIManager will be deprecated by Fabric UIManager. // For now, ignore this spec completely because the types are not fully supported. !f.endsWith('NativeUIManager.js') && + // NativeSampleTurboModule is for demo purpose. It should be added manually to the + // app for now. + !f.endsWith('NativeSampleTurboModule.js') && !f.includes('__tests'), ); allFiles.push(...dirFiles); diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp index 60d8c7fba8..06c20c981c 100644 --- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp +++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp @@ -9,8 +9,7 @@ #include #include -// TODO: Remove SampleTurboModule from ReactAndroidSpec, then uncomment. -// #include +#include namespace facebook { namespace react { @@ -21,11 +20,10 @@ std::shared_ptr RNTesterAppModuleProvider(const std::string moduleN return module; } - // TODO: Remove SampleTurboModule from ReactAndroidSpec, then uncomment. - // module = SampleTurboModuleSpec_ModuleProvider(moduleName, params); - // if (module != nullptr) { - // return module; - // } + module = SampleTurboModuleSpec_ModuleProvider(moduleName, params); + if (module != nullptr) { + return module; + } // TODO: fix up the ReactAndroidSpec_ModuleProvider() to avoid the Android prefix. if (moduleName == "DatePicker") {