Classify cxxreact/JSBundleType.h as for-frameworks (#58956)

packages/react-native/ReactCommon/cxxreact/JSBundleType.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <folly/Portability.h>
 #include <cstdint>

packages/react-native/ReactCommon/cxxreact/React/JSBigString.h

@@ -31,7 +31,6 @@
 #define RN_UMBRELLA_CONTEXT 1
 
 #include <cxxreact/JSBigString.h>
-#include <cxxreact/JSBundleType.h>
 
 #undef RN_UMBRELLA_CONTEXT
 #pragma pop_macro("RN_UMBRELLA_CONTEXT")

packages/react-native/ReactCommon/react/nativemodule/core/React/NativeModuleCore.h

@@ -33,13 +33,11 @@
 
 #include <ReactCommon/CxxTurboModuleUtils.h>
 #include <ReactCommon/TurboModule.h>
-#include <ReactCommon/TurboModuleBinding.h>
 #include <ReactCommon/TurboModulePerfLogger.h>
 #include <ReactCommon/TurboModuleUtils.h>
 #include <ReactCommon/TurboModuleWithJSIBindings.h>
 
 #ifdef ANDROID
-#include <ReactCommon/JavaInteropTurboModule.h>
 #include <ReactCommon/JavaTurboModule.h>
 #endif
 

packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h

@@ -7,15 +7,14 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <string>
 
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
-#include <ReactCommon/TurboModule.h>
-
 namespace facebook::react {
 
 class BridgelessNativeModuleProxy;

packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h

@@ -7,19 +7,17 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
 
 #include <string>
 #include <vector>
 
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
 
-#include "JavaTurboModule.h"
-
 namespace facebook::react {
 
 class JSI_EXPORT JavaInteropTurboModule : public JavaTurboModule {

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <react/cxxstableapi/FrameworksGuard.h>
+
 #ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
 
 #import <string>

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm

@@ -28,6 +28,7 @@
 #import <React/RCTUtils.h>
 #import <ReactCommon/CxxTurboModuleUtils.h>
 #import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
+#import <ReactCommon/TurboModuleBinding.h>
 #import <ReactCommon/TurboModulePerfLogger.h>
 
 using namespace facebook;

packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt

@@ -23,7 +23,7 @@ react_native_android_selector(platform_DIR
         ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
         ${CMAKE_CURRENT_SOURCE_DIR}/platform/cxx/)
 target_include_directories(rrc_view PUBLIC ${REACT_COMMON_DIR} ${platform_DIR})
-target_include_directories(rrc_view INTERFACE ${REACT_COMMON_DIR}/react/renderer/components/view)
+target_include_directories(rrc_view PUBLIC ${REACT_COMMON_DIR}/react/renderer/components/view)
 
 target_link_libraries(rrc_view
         folly_runtime

packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceComponentDescriptor.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/components/view/LayoutConformanceShadowNode.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceProps.h

@@ -7,11 +7,10 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/components/view/YogaStylableProps.h>
-#include <react/renderer/components/view/conversions.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
+#include <React/View.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceShadowNode.h

@@ -7,11 +7,10 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <React/View.h>
 #include <react/renderer/components/view/LayoutConformanceProps.h>
-#include <react/renderer/components/view/YogaLayoutableShadowNode.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/components/view/React/View.h

@@ -41,9 +41,6 @@
 #include <react/renderer/components/view/HostPlatformViewEventEmitter.h>
 #include <react/renderer/components/view/HostPlatformViewProps.h>
 #include <react/renderer/components/view/HostPlatformViewTraitsInitializer.h>
-#include <react/renderer/components/view/LayoutConformanceComponentDescriptor.h>
-#include <react/renderer/components/view/LayoutConformanceProps.h>
-#include <react/renderer/components/view/LayoutConformanceShadowNode.h>
 #include <react/renderer/components/view/PointerEvent.h>
 #include <react/renderer/components/view/Touch.h>
 #include <react/renderer/components/view/TouchEvent.h>
@@ -55,6 +52,7 @@
 #include <react/renderer/components/view/YogaLayoutableShadowNode.h>
 #include <react/renderer/components/view/YogaStylableProps.h>
 #include <react/renderer/components/view/accessibilityPropsConversions.h>
+#include <react/renderer/components/view/conversions.h>
 #include <react/renderer/components/view/primitives.h>
 
 #undef RN_UMBRELLA_CONTEXT

scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api

@@ -376,7 +376,6 @@ struct facebook::hermes::ISetEventLoopControl : public facebook::jsi::ICast {
 const char facebook::react::ViewComponentName[];
 const facebook::react::EventTag facebook::react::EMPTY_EVENT_TAG;
 constexpr auto facebook::react::rncore_ModuleProvider;
-constexpr char facebook::react::LayoutConformanceShadowNodeComponentName[];
 constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion;
 constexpr facebook::react::Tag facebook::react::kNoTag;
 constexpr uint32_t facebook::react::INITIAL_BUCKETS_SIZE;
@@ -424,7 +423,6 @@ using facebook::react::GradientDirection = std::variant<facebook::react::Float,
 using facebook::react::HostPlatformTouch = facebook::react::BaseTouch;
 using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter;
 using facebook::react::ImageSources = std::vector<facebook::react::ImageSource>;
-using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor<facebook::react::LayoutConformanceShadowNode>;
 using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t;
 using facebook::react::NativeMethodCallFunc = std::function<void()>;
 using facebook::react::PromiseSetupFunctionType = std::function<void(facebook::jsi::Runtime& rt, std::shared_ptr<facebook::react::Promise>)>;
@@ -493,9 +491,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
 bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
 bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
 bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
-bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
 bool facebook::react::isZero(facebook::react::Float n);
-const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
 constexpr auto facebook::react::to_underlying(auto e) noexcept;
 constexpr char facebook::react::toLower(char c);
 constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -512,7 +508,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
 facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
 facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
 facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
-facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
 facebook::react::SharedColor facebook::react::blackColor();
 facebook::react::SharedColor facebook::react::clearColor();
 facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -1685,19 +1680,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass<face
   public static constexpr auto kJavaDescriptor;
 }
 
-class facebook::react::JavaInteropTurboModule : public facebook::react::JavaTurboModule {
-  protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
-  public JavaInteropTurboModule(const facebook::react::JavaTurboModule::InitParams& params, const std::vector<facebook::react::JavaInteropTurboModule::MethodDescriptor>& methodDescriptors);
-  public virtual std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime& runtime) override;
-}
-
-struct facebook::react::JavaInteropTurboModule::MethodDescriptor {
-  public facebook::react::TurboModuleMethodValueKind jsiReturnKind;
-  public int jsArgCount;
-  public std::string jniSignature;
-  public std::string methodName;
-}
-
 class facebook::react::JavaMessageQueueThread : public facebook::jni::JavaClass<facebook::react::JavaMessageQueueThread> {
   public static constexpr auto kJavaDescriptor;
 }
@@ -1724,9 +1706,6 @@ struct facebook::react::JavaTurboModule::InitParams {
   public std::string moduleName;
 }
 
-class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
-}
-
 class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
   public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
   public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
@@ -2489,12 +2468,6 @@ struct facebook::react::TurboModule::MethodMetadata {
   public size_t argCount;
 }
 
-class facebook::react::TurboModuleBinding {
-  public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
-  public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
-  public ~TurboModuleBinding();
-}
-
 class facebook::react::TurboModuleManager : public jni::HybridClass<facebook::react::TurboModuleManager> {
   public static constexpr auto kJavaDescriptor;
   public static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>, jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder, jni::alias_ref<NativeMethodCallInvokerHolder::javaobject> nativeMethodCallInvokerHolder, jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
@@ -3028,11 +3001,6 @@ enum facebook::react::SchedulerPriority : int {
   UserBlockingPriority,
 }
 
-enum facebook::react::ScriptTag {
-  RAMBundle,
-  String,
-}
-
 enum facebook::react::TransformOperationType : uint8_t {
   Arbitrary,
   Identity,
@@ -3194,13 +3162,6 @@ struct facebook::react::Bridging<void> {
   public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
 }
 
-struct facebook::react::BundleHeader {
-  public BundleHeader();
-  public facebook::react::Magic32 magic32;
-  public uint32_t version;
-  public uint64_t magic64;
-}
-
 struct facebook::react::Color {
   public bool isDefined;
   public constexpr Color() = default;
@@ -3375,12 +3336,6 @@ struct facebook::react::JTurboModuleWithJSIBindings : public facebook::jni::Java
   public static constexpr auto kJavaDescriptor;
 }
 
-struct facebook::react::LayoutConformanceProps : public facebook::react::YogaStylableProps {
-  public LayoutConformanceProps() = default;
-  public LayoutConformanceProps(const facebook::react::PropsParserContext& context, const facebook::react::LayoutConformanceProps& sourceProps, const facebook::react::RawProps& rawProps);
-  public facebook::react::LayoutConformance mode;
-}
-
 struct facebook::react::LayoutConstraints {
   public facebook::react::LayoutDirection layoutDirection;
   public facebook::react::Size clamp(const facebook::react::Size& size) const;
@@ -3421,11 +3376,6 @@ struct facebook::react::LinearGradient {
   public std::vector<facebook::react::ColorStop> colorStops;
 }
 
-struct facebook::react::Magic32 {
-  public uint32_t reserved_;
-  public uint32_t value;
-}
-
 struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
   public facebook::react::ModalHostViewSupportedOrientationsMask value;
 }