Fix duplication across and rncore and FBReactNativeComponentSpec (#43385)

javache · facebook-github-bot · commit ef770872930c · 2024-03-18T07:30:33.000-07:00
Summary: Pull Request resolved: #43385 `rncore` and `FBReactNativeComponentSpec` contain the same symbols, which leads to conflicts when we try to merge them into a single shared library. Cleanup the duplication and standardize on `FBReactNativeComponentSpec` everywhere. I've left the Android OSS targets as is, to avoid breaking deps. Changelog: [Internal] Reviewed By: cortinico, dmytrorykun Differential Revision: D54630694 fbshipit-source-id: 75cb961ded9fd75508755c0530e29409fef801cf
diff --git a/.gitignore b/.gitignore
@@ -127,6 +127,7 @@ vendor/
 /packages/react-native/React/FBReactNativeSpec/FBReactNativeSpec
 /packages/react-native-codegen/lib
 /packages/react-native-codegen/tmp/
+/packages/react-native/ReactCommon/react/renderer/components/FBReactNativeComponentSpec/
 /packages/react-native/ReactCommon/react/renderer/components/rncore/
 /packages/rn-tester/NativeModuleExample/ScreenshotManagerSpec*
 /**/RCTThirdPartyFabricComponentsProvider.*
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/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 === 'FBReactNativeComponentSpec' ? 'rncore' : libraryName;
     return new Map([
       [`jni/${fileName}`, replacedTemplate],
-      ['jni/CMakeLists.txt', CMakeListsTemplate({libraryName: libraryName})],
+      ['jni/CMakeLists.txt', CMakeListsTemplate({libraryName, targetName})],
     ]);
   },
 };
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm b/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/FBReactNativeComponentSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 
 #import "RCTFabricComponentsPlugins.h"
 
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/DebuggingOverlay/RCTDebuggingOverlayComponentView.h b/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/FBReactNativeComponentSpec/RCTComponentViewHelpers.h>
 
 @interface RCTDebuggingOverlayComponentView : RCTViewComponentView <RCTDebuggingOverlayViewProtocol>
 
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/DebuggingOverlay/RCTDebuggingOverlayComponentView.mm b/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/FBReactNativeComponentSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/Props.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/RCTComponentViewHelpers.h>
 
 #import "RCTFabricComponentsPlugins.h"
 
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm b/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/FBReactNativeComponentSpec/Props.h>
 #import <react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h>
-#import <react/renderer/components/rncore/Props.h>
 #import "RCTInputAccessoryContentView.h"
 
 #import "RCTFabricComponentsPlugins.h"
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm b/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/FBReactNativeComponentSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/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"
 
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm b/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/FBReactNativeComponentSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/Props.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/RCTComponentViewHelpers.h>
 
 #import <React/RCTConversions.h>
 #import <React/RCTRefreshableProtocol.h>
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm b/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/FBReactNativeComponentSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/Props.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/RCTComponentViewHelpers.h>
 
 #import "RCTFabricComponentsPlugins.h"
 
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.mm b/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/FBReactNativeComponentSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 
 using namespace facebook::react;
 
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm b/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/FBReactNativeComponentSpec/ComponentDescriptors.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#import <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 
 #import <react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h>
 #import <react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h>
diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts
@@ -769,9 +769,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 = "FBReactNativeComponentSpec"
   jsRootDir = file("../src")
 }
 
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp b/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/FBReactNativeComponentSpec/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>
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp b/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/FBReactNativeComponentSpec/ComponentDescriptors.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp
@@ -9,9 +9,9 @@
 
 #include <algorithm>
 
+#include <FBReactNativeSpec.h>
 #include <react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h>
 #include <react/nativemodule/microtasks/NativeMicrotasks.h>
-#include <rncore.h>
 
 namespace facebook::react {
 
@@ -95,7 +95,7 @@ std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
       return resolvedModule;
     }
   }
-  return rncore_ModuleProvider(name, params);
+  return FBReactNativeSpec_ModuleProvider(name, params);
 }
 
 } // namespace facebook::react
diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -156,11 +156,11 @@ Pod::Spec.new do |s|
       sss.header_dir           = "react/renderer/components/modal"
     end
 
-    ss.subspec "rncore" do |sss|
+    ss.subspec "FBReactNativeComponentSpec" 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/FBReactNativeComponentSpec/**/*.{m,mm,cpp,h}"
+      sss.header_dir           = "react/renderer/components/FBReactNativeComponentSpec"
     end
 
     ss.subspec "root" do |sss|
@@ -304,13 +304,13 @@ Pod::Spec.new do |s|
 
   s.script_phases = [
     {
-      :name => '[RN]Check rncore',
+      :name => '[RN] Check FBReactNativeComponentSpec codegen',
       :execution_position => :before_compile,
       :script => <<-EOS
 echo "Checking whether Codegen has run..."
-rncorePath="$REACT_NATIVE_PATH/ReactCommon/react/renderer/components/rncore"
+codegen_path="$REACT_NATIVE_PATH/ReactCommon/react/renderer/components/FBReactNativeComponentSpec"
 
-if [[ ! -d "$rncorePath" ]]; then
+if [[ ! -d "$codegen_path" ]]; then
   echo 'error: Codegen did not run properly in your project. Please reinstall cocoapods with `bundle exec pod install`.'
   exit 1
 fi
diff --git a/packages/react-native/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 #include <react/renderer/components/inputaccessory/InputAccessoryState.h>
-#include <react/renderer/components/rncore/EventEmitters.h>
-#include <react/renderer/components/rncore/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 #include <react/renderer/components/modal/ModalHostViewState.h>
-#include <react/renderer/components/rncore/EventEmitters.h>
-#include <react/renderer/components/rncore/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp
@@ -9,6 +9,7 @@
 
 #include <fbjni/fbjni.h>
 #include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/components/progressbar/conversions.h>
 #include <react/renderer/core/conversions.h>
 
 using namespace facebook::jni;
diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h
@@ -7,8 +7,7 @@
 
 #pragma once
 
-#include <react/renderer/components/progressbar/conversions.h>
-#include <react/renderer/components/rncore/Props.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/utils/ContextContainer.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 #include <react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h>
-#include <react/renderer/components/rncore/EventEmitters.h>
-#include <react/renderer/components/rncore/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/conversions.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <folly/dynamic.h>
-#include <react/renderer/components/rncore/Props.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <react/renderer/components/rncore/EventEmitters.h>
-#include <react/renderer/components/rncore/Props.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 #include <react/renderer/components/safeareaview/SafeAreaViewState.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.h
@@ -9,8 +9,8 @@
 
 #include "AndroidSwitchMeasurementsManager.h"
 
-#include <react/renderer/components/rncore/EventEmitters.h>
-#include <react/renderer/components/rncore/Props.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/EventEmitters.h>
+#include <react/renderer/components/FBReactNativeComponentSpec/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -145,7 +145,7 @@
         "jsSrcsDir": "src"
       },
       {
-        "name": "rncore",
+        "name": "FBReactNativeComponentSpec",
         "type": "components",
         "ios": {},
         "android": {},
diff --git a/packages/react-native/scripts/codegen/generate-artifacts-executor.js b/packages/react-native/scripts/codegen/generate-artifacts-executor.js
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
