Remove core modules from the default tmmdelegate

packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp

@@ -32,6 +32,7 @@
 #include <fbjni/fbjni.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <rncli.h>
+#include <rncore.h>
 
 #ifdef REACT_NATIVE_APP_CODEGEN_HEADER
 #include REACT_NATIVE_APP_CODEGEN_HEADER
@@ -95,8 +96,17 @@ std::shared_ptr<TurboModule> javaModuleProvider(
   }
 #endif
 
+  // We first try to look up core modules
+  if (auto module = rncore_ModuleProvider(name, params)) {
+    return module;
+  }
+
   // And we fallback to the module providers autolinked by RN CLI
-  return rncli_ModuleProvider(name, params);
+  if (auto module = rncli_ModuleProvider(name, params)) {
+    return module;
+  }
+
+  return nullptr;
 }
 
 } // namespace facebook::react

packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp

@@ -12,7 +12,6 @@
 #include <react/nativemodule/dom/NativeDOM.h>
 #include <react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h>
 #include <react/nativemodule/microtasks/NativeMicrotasks.h>
-#include <rncore.h>
 
 namespace facebook::react {
 
@@ -100,7 +99,8 @@ std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
       return resolvedModule;
     }
   }
-  return rncore_ModuleProvider(name, params);
+
+  return nullptr;
 }
 
 } // namespace facebook::react

packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp

@@ -17,13 +17,21 @@
 #include <ReactCommon/TurboCxxModule.h>
 #include <ReactCommon/TurboModuleBinding.h>
 #include <ReactCommon/TurboModulePerfLogger.h>
+#include <glog/logging.h>
 
 #include "TurboModuleManager.h"
 
 namespace facebook::react {
 
 namespace {
 
+static void logFoundModule(const std::string& moduleName) {
+  static int count = 0;
+  count++;
+  LOG(INFO) << "RAMAN: found module " << std::to_string(count) << ") "
+            << moduleName << std::endl;
+}
+
 class JMethodDescriptor : public jni::JavaClass<JMethodDescriptor> {
  public:
   static auto constexpr kJavaDescriptor =
@@ -163,6 +171,7 @@ TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
 
     auto cxxModule = delegate->cthis()->getTurboModule(name, jsCallInvoker);
     if (cxxModule) {
+      logFoundModule(name);
       turboModuleCache->insert({name, cxxModule});
       return cxxModule;
     }
@@ -172,6 +181,7 @@ TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
     if (it != cxxTurboModuleMapProvider.end()) {
       auto turboModule = it->second(jsCallInvoker);
       turboModuleCache->insert({name, turboModule});
+      logFoundModule(name);
       return turboModule;
     }
 
@@ -189,6 +199,7 @@ TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
       turboModuleCache->insert({name, turboModule});
 
       TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
+      logFoundModule(name);
       return turboModule;
     }
 
@@ -210,6 +221,7 @@ TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
       auto turboModule = delegate->cthis()->getTurboModule(name, params);
       turboModuleCache->insert({name, turboModule});
       TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
+      logFoundModule(name);
       return turboModule;
     }
 

packages/rn-tester/android/app/src/main/jni/OnLoad.cpp

@@ -11,6 +11,7 @@
 #include <ReactCommon/SampleTurboModuleSpec.h>
 #include <fbjni/fbjni.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <rncore.h>
 
 #ifdef REACT_NATIVE_APP_CODEGEN_HEADER
 #include REACT_NATIVE_APP_CODEGEN_HEADER
@@ -51,6 +52,12 @@ std::shared_ptr<TurboModule> javaModuleProvider(
     return module;
   }
 #endif
+
+  // We first try to look up core modules
+  if (auto module = rncore_ModuleProvider(name, params)) {
+    return module;
+  }
+
   return nullptr;
 }