Merge all core codegen into FBReactNativeSpec

packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js

@@ -63,7 +63,8 @@ std::shared_ptr<TurboModule> ${libraryName}_ModuleProvider(const std::string &mo
 // Note: this CMakeLists.txt template includes dependencies for both NativeModule and components.
 const CMakeListsTemplate = ({
   libraryName,
-}: $ReadOnly<{libraryName: string}>) => {
+  targetName,
+}: $ReadOnly<{libraryName: string, targetName: string}>) => {
   return `# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
@@ -75,20 +76,20 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/${libraryName}/*.cpp)
 
 add_library(
-  react_codegen_${libraryName}
+  react_codegen_${targetName}
   SHARED
   \${react_codegen_SRCS}
 )
 
-target_include_directories(react_codegen_${libraryName} PUBLIC . react/renderer/components/${libraryName})
+target_include_directories(react_codegen_${targetName} PUBLIC . react/renderer/components/${libraryName})
 
 target_link_libraries(
-  react_codegen_${libraryName}
+  react_codegen_${targetName}
   fbjni
   folly_runtime
   glog
   jsi
-  ${libraryName !== 'rncore' ? 'react_codegen_rncore' : ''}
+  ${targetName !== 'rncore' ? 'react_codegen_rncore' : ''}
   react_debug
   react_nativemodule_core
   react_render_componentregistry
@@ -105,7 +106,7 @@ target_link_libraries(
 )
 
 target_compile_options(
-  react_codegen_${libraryName}
+  react_codegen_${targetName}
   PRIVATE
   -DLOG_TAG=\\"ReactNative\\"
   -fexceptions
@@ -142,9 +143,12 @@ module.exports = {
       modules: modules,
       libraryName: libraryName.replace(/-/g, '_'),
     });
+    // Use rncore as target name for backwards compat
+    const targetName =
+      libraryName === 'FBReactNativeSpec' ? 'rncore' : libraryName;
     return new Map([
       [`jni/${fileName}`, replacedTemplate],
-      ['jni/CMakeLists.txt', CMakeListsTemplate({libraryName: libraryName})],
+      ['jni/CMakeLists.txt', CMakeListsTemplate({libraryName, targetName})],
     ]);
   },
 };

packages/react-native/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm

@@ -9,9 +9,9 @@
 
 #import <React/RCTConversions.h>
 
-#import <react/renderer/components/rncore/ComponentDescriptors.h>
-#import <react/renderer/components/rncore/EventEmitters.h>
-#import <react/renderer/components/rncore/Props.h>
+#import <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeSpec/Props.h>
 
 #import "RCTFabricComponentsPlugins.h"
 

packages/react-native/React/Fabric/Mounting/ComponentViews/DebuggingOverlay/RCTDebuggingOverlayComponentView.h

@@ -9,7 +9,7 @@
 
 #import <React/RCTViewComponentView.h>
 
-#import <react/renderer/components/rncore/RCTComponentViewHelpers.h>
+#import <react/renderer/components/FBReactNativeSpec/RCTComponentViewHelpers.h>
 
 @interface RCTDebuggingOverlayComponentView : RCTViewComponentView <RCTDebuggingOverlayViewProtocol>
 

packages/react-native/React/Fabric/Mounting/ComponentViews/DebuggingOverlay/RCTDebuggingOverlayComponentView.mm

@@ -11,10 +11,10 @@
 #import <React/RCTDefines.h>
 #import <React/RCTLog.h>
 
-#import <react/renderer/components/rncore/ComponentDescriptors.h>
-#import <react/renderer/components/rncore/EventEmitters.h>
-#import <react/renderer/components/rncore/Props.h>
-#import <react/renderer/components/rncore/RCTComponentViewHelpers.h>
+#import <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeSpec/Props.h>
+#import <react/renderer/components/FBReactNativeSpec/RCTComponentViewHelpers.h>
 
 #import "RCTFabricComponentsPlugins.h"
 

packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm

@@ -12,8 +12,8 @@
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
+#import <react/renderer/components/FBReactNativeSpec/Props.h>
 #import <react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h>
-#import <react/renderer/components/rncore/Props.h>
 #import "RCTInputAccessoryContentView.h"
 
 #import "RCTFabricComponentsPlugins.h"

packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -10,10 +10,10 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTModalManager.h>
 #import <React/UIView+React.h>
+#import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeSpec/Props.h>
 #import <react/renderer/components/modal/ModalHostViewComponentDescriptor.h>
 #import <react/renderer/components/modal/ModalHostViewState.h>
-#import <react/renderer/components/rncore/EventEmitters.h>
-#import <react/renderer/components/rncore/Props.h>
 
 #import "RCTConversions.h"
 

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm

@@ -7,10 +7,10 @@
 
 #import "RCTPullToRefreshViewComponentView.h"
 
-#import <react/renderer/components/rncore/ComponentDescriptors.h>
-#import <react/renderer/components/rncore/EventEmitters.h>
-#import <react/renderer/components/rncore/Props.h>
-#import <react/renderer/components/rncore/RCTComponentViewHelpers.h>
+#import <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeSpec/Props.h>
+#import <react/renderer/components/FBReactNativeSpec/RCTComponentViewHelpers.h>
 
 #import <React/RCTConversions.h>
 #import <React/RCTRefreshableProtocol.h>

packages/react-native/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm

@@ -9,10 +9,10 @@
 
 #import <React/RCTConversions.h>
 
-#import <react/renderer/components/rncore/ComponentDescriptors.h>
-#import <react/renderer/components/rncore/EventEmitters.h>
-#import <react/renderer/components/rncore/Props.h>
-#import <react/renderer/components/rncore/RCTComponentViewHelpers.h>
+#import <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeSpec/Props.h>
+#import <react/renderer/components/FBReactNativeSpec/RCTComponentViewHelpers.h>
 
 #import "RCTFabricComponentsPlugins.h"
 

packages/react-native/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.mm

@@ -7,9 +7,9 @@
 
 #import "RCTUnimplementedNativeComponentView.h"
 
-#import <react/renderer/components/rncore/ComponentDescriptors.h>
-#import <react/renderer/components/rncore/EventEmitters.h>
-#import <react/renderer/components/rncore/Props.h>
+#import <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeSpec/Props.h>
 
 using namespace facebook::react;
 

packages/react-native/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm

@@ -7,9 +7,9 @@
 
 #import "RCTUnimplementedViewComponentView.h"
 
-#import <react/renderer/components/rncore/ComponentDescriptors.h>
-#import <react/renderer/components/rncore/EventEmitters.h>
-#import <react/renderer/components/rncore/Props.h>
+#import <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeSpec/Props.h>
 
 #import <react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h>
 #import <react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h>

packages/react-native/ReactAndroid/build.gradle.kts

@@ -778,9 +778,7 @@ dependencies {
 }
 
 react {
-  // TODO: The library name is chosen for parity with Fabric components & iOS
-  // This should be changed to a more generic name, e.g. `ReactCoreSpec`.
-  libraryName = "rncore"
+  libraryName = "FBReactNativeSpec"
   jsRootDir = file("../src")
 }
 

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

@@ -29,10 +29,10 @@
 
 #include <DefaultComponentsRegistry.h>
 #include <DefaultTurboModuleManagerDelegate.h>
+#include <FBReactNativeSpec.h>
 #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
@@ -97,7 +97,7 @@ std::shared_ptr<TurboModule> javaModuleProvider(
 #endif
 
   // We first try to look up core modules
-  if (auto module = rncore_ModuleProvider(name, params)) {
+  if (auto module = FBReactNativeSpec_ModuleProvider(name, params)) {
     return module;
   }
 

packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp

@@ -12,12 +12,12 @@
 #include <fbjni/fbjni.h>
 
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+#include <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
 #include <react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h>
 #include <react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h>
 #include <react/renderer/components/image/ImageComponentDescriptor.h>
 #include <react/renderer/components/modal/ModalHostViewComponentDescriptor.h>
 #include <react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h>
-#include <react/renderer/components/rncore/ComponentDescriptors.h>
 #include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
 #include <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #include <react/renderer/components/text/RawTextComponentDescriptor.h>

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

@@ -11,7 +11,7 @@
 #include <fbjni/fbjni.h>
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/components/rncore/ComponentDescriptors.h>
+#include <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
 
 namespace facebook::react {
 

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

@@ -9,6 +9,7 @@
 
 #include <algorithm>
 
+#include <FBReactNativeSpec.h>
 #include <react/nativemodule/dom/NativeDOM.h>
 #include <react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h>
 #include <react/nativemodule/microtasks/NativeMicrotasks.h>
@@ -100,7 +101,7 @@ std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
     }
   }
 
-  return nullptr;
+  return FBReactNativeSpec_ModuleProvider(name, params);
 }
 
 } // namespace facebook::react

packages/react-native/ReactCommon/React-Fabric.podspec

@@ -95,6 +95,7 @@ Pod::Spec.new do |s|
       "\"$(PODS_TARGET_SRCROOT)\"",
       "\"$(PODS_ROOT)/DoubleConversion\"",
       "\"$(PODS_ROOT)/fmt/include\"",
+      "\"$(PODS_ROOT)/Headers/Public/ReactCodegen\""
     ]
 
     if ENV['USE_FRAMEWORKS']
@@ -130,7 +131,6 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "components" do |ss|
-
     ss.subspec "inputaccessory" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
@@ -156,11 +156,11 @@ Pod::Spec.new do |s|
       sss.header_dir           = "react/renderer/components/modal"
     end
 
-    ss.subspec "rncore" do |sss|
+    ss.subspec "FBReactNativeSpec" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "react/renderer/components/rncore/**/*.{m,mm,cpp,h}"
-      sss.header_dir           = "react/renderer/components/rncore"
+      sss.source_files         = "react/renderer/components/FBReactNativeSpec/**/*.{m,mm,cpp,h}"
+      sss.header_dir           = "react/renderer/components/FBReactNativeSpec"
     end
 
     ss.subspec "root" do |sss|
@@ -177,7 +177,6 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/safeareaview/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/safeareaview/tests"
       sss.header_dir           = "react/renderer/components/safeareaview"
-
     end
 
     ss.subspec "scrollview" do |sss|
@@ -186,7 +185,6 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/scrollview/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/scrollview/tests"
       sss.header_dir           = "react/renderer/components/scrollview"
-
     end
 
     ss.subspec "text" do |sss|
@@ -195,23 +193,20 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/text/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/text/tests"
       sss.header_dir           = "react/renderer/components/text"
-
     end
 
     ss.subspec "iostextinput" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "react/renderer/components/textinput/platform/ios/**/*.{m,mm,cpp,h}"
       sss.header_dir           = "react/renderer/components/iostextinput"
-
     end
 
     ss.subspec "textinput" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "react/renderer/components/textinput/*.{m,mm,cpp,h}"
       sss.header_dir           = "react/renderer/components/textinput"
-
     end
 
     ss.subspec "unimplementedview" do |sss|
@@ -220,7 +215,6 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/unimplementedview/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/unimplementedview/tests"
       sss.header_dir           = "react/renderer/components/unimplementedview"
-
     end
 
     ss.subspec "view" do |sss|
@@ -310,7 +304,6 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/telemetry/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/telemetry/tests"
     ss.header_dir           = "react/renderer/telemetry"
-
   end
 
   s.subspec "leakchecker" do |ss|
@@ -321,20 +314,4 @@ Pod::Spec.new do |s|
     ss.header_dir           = "react/renderer/leakchecker"
     ss.pod_target_xcconfig  = { "GCC_WARN_PEDANTIC" => "YES" }
   end
-
-  s.script_phases = [
-    {
-      :name => '[RN]Check rncore',
-      :execution_position => :before_compile,
-      :script => <<-EOS
-echo "Checking whether Codegen has run..."
-rncorePath="$REACT_NATIVE_PATH/ReactCommon/react/renderer/components/rncore"
-
-if [[ ! -d "$rncorePath" ]]; then
-  echo 'error: Codegen did not run properly in your project. Please reinstall cocoapods with `bundle exec pod install`.'
-  exit 1
-fi
-      EOS
-    }
-  ]
 end

packages/react-native/ReactCommon/react/nativemodule/dom/NativeDOM.h

@@ -9,9 +9,7 @@
 
 #include <string>
 
-#if __has_include("rncoreJSI.h") // Cmake headers on Android
-#include "rncoreJSI.h"
-#elif __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
+#if __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
 #include "FBReactNativeSpecJSI.h"
 #else
 #include <FBReactNativeSpec/FBReactNativeSpecJSI.h>

packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<0dcfc928ff0eca1cb37766170d9b4379>>
+ * @generated SignedSource<<dd6da4bece7d5bc8be176f12c7132638>>
  */
 
 /**
@@ -19,9 +19,7 @@
 
 #pragma once
 
-#if __has_include("rncoreJSI.h") // Cmake headers on Android
-#include "rncoreJSI.h"
-#elif __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
+#if __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
 #include "FBReactNativeSpecJSI.h"
 #else
 #include <FBReactNativeSpec/FBReactNativeSpecJSI.h>

packages/react-native/ReactCommon/react/nativemodule/microtasks/NativeMicrotasks.h

@@ -7,9 +7,7 @@
 
 #pragma once
 
-#if __has_include("rncoreJSI.h") // Cmake headers on Android
-#include "rncoreJSI.h"
-#elif __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
+#if __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
 #include "FBReactNativeSpecJSI.h"
 #else
 #include <FBReactNativeSpec/FBReactNativeSpecJSI.h>