react-native 0.68.2 → 0.69.0-rc.2

package/ReactCommon/react/renderer/animations/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_render_animations_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_render_animations SHARED ${react_render_animations_SRC})
+
+target_include_directories(react_render_animations PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_render_animations
+        folly_runtime
+        glog
+        glog_init
+        jsi
+        react_config
+        react_debug
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_mounting
+        react_render_uimanager
+        rrc_view
+        runtimeexecutor
+        yoga
+)

package/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp

@@ -173,7 +173,7 @@ bool LayoutAnimationKeyFrameManager::shouldOverridePullTransaction() const {
   return shouldAnimateFrame();
 }
 
-butter::optional<MountingTransaction>
+std::optional<MountingTransaction>
 LayoutAnimationKeyFrameManager::pullTransaction(
     SurfaceId surfaceId,
     MountingTransaction::Number transactionNumber,
@@ -251,7 +251,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
         surfaceId, mutations, conflictingAnimations);
 
     // Are we animating this list of mutations?
-    butter::optional<LayoutAnimation> currentAnimation{};
+    std::optional<LayoutAnimation> currentAnimation{};
     {
       std::lock_guard<std::mutex> lock(currentAnimationMutex_);
       if (currentAnimation_) {
@@ -260,7 +260,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       }
     }
 
-    if (currentAnimation.hasValue()) {
+    if (currentAnimation.has_value()) {
       LayoutAnimation animation = std::move(currentAnimation).value();
       animation.surfaceId = surfaceId;
       animation.startTime = now;
@@ -321,7 +321,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
           continue;
         }
 
-        butter::optional<ShadowViewMutation> executeMutationImmediately{};
+        std::optional<ShadowViewMutation> executeMutationImmediately{};
 
         bool isRemoveReinserted =
             mutation.type == ShadowViewMutation::Type::Remove &&
@@ -703,7 +703,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
           keyFramesToAnimate.push_back(keyFrame);
         }
 
-        if (executeMutationImmediately.hasValue()) {
+        if (executeMutationImmediately.has_value()) {
           PrintMutationInstruction(
               "Queue Up For Immediate Execution", *executeMutationImmediately);
           immediateMutations.push_back(*executeMutationImmediately);
@@ -1064,7 +1064,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
 
 void LayoutAnimationKeyFrameManager::uiManagerDidConfigureNextLayoutAnimation(
     LayoutAnimation layoutAnimation) const {
-  currentAnimation_ = butter::optional<LayoutAnimation>{layoutAnimation};
+  currentAnimation_ = std::optional<LayoutAnimation>{layoutAnimation};
 }
 
 void LayoutAnimationKeyFrameManager::setLayoutAnimationStatusDelegate(

package/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include <ReactCommon/RuntimeExecutor.h>
-#include <butter/optional.h>
 #include <butter/set.h>
 #include <react/renderer/animations/LayoutAnimationCallbackWrapper.h>
 #include <react/renderer/animations/primitives.h>
@@ -20,6 +19,8 @@
 #include <react/renderer/uimanager/LayoutAnimationStatusDelegate.h>
 #include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
 
+#include <optional>
+
 namespace facebook {
 namespace react {
 
@@ -67,7 +68,7 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
   // This is used to "hijack" the diffing process to figure out which mutations
   // should be animated. The mutations returned by this function will be
   // executed immediately.
-  butter::optional<MountingTransaction> pullTransaction(
+  std::optional<MountingTransaction> pullTransaction(
       SurfaceId surfaceId,
       MountingTransaction::Number number,
       TransactionTelemetry const &telemetry,
@@ -95,7 +96,7 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
 
  protected:
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
-  mutable butter::optional<LayoutAnimation> currentAnimation_{};
+  mutable std::optional<LayoutAnimation> currentAnimation_{};
   mutable std::mutex currentAnimationMutex_;
 
   /**

package/ReactCommon/react/renderer/animations/conversions.h

@@ -5,15 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <butter/optional.h>
+#include <glog/logging.h>
 #include <react/renderer/animations/primitives.h>
 
-#include <glog/logging.h>
+#include <optional>
 
 namespace facebook {
 namespace react {
 
-static inline butter::optional<AnimationType> parseAnimationType(
+static inline std::optional<AnimationType> parseAnimationType(
     std::string param) {
   if (param == "spring") {
     return AnimationType::Spring;
@@ -38,7 +38,7 @@ static inline butter::optional<AnimationType> parseAnimationType(
   return {};
 }
 
-static inline butter::optional<AnimationProperty> parseAnimationProperty(
+static inline std::optional<AnimationProperty> parseAnimationProperty(
     std::string param) {
   if (param == "opacity") {
     return AnimationProperty::Opacity;
@@ -57,7 +57,7 @@ static inline butter::optional<AnimationProperty> parseAnimationProperty(
   return {};
 }
 
-static inline butter::optional<AnimationConfig> parseAnimationConfig(
+static inline std::optional<AnimationConfig> parseAnimationConfig(
     folly::dynamic const &config,
     double defaultDuration,
     bool parsePropertyType) {
@@ -163,7 +163,7 @@ static inline butter::optional<AnimationConfig> parseAnimationConfig(
     }
   }
 
-  return butter::optional<AnimationConfig>(AnimationConfig{
+  return std::optional<AnimationConfig>(AnimationConfig{
       *animationType,
       animationProperty,
       duration,
@@ -173,8 +173,8 @@ static inline butter::optional<AnimationConfig> parseAnimationConfig(
 }
 
 // Parse animation config from JS
-static inline butter::optional<LayoutAnimationConfig>
-parseLayoutAnimationConfig(folly::dynamic const &config) {
+static inline std::optional<LayoutAnimationConfig> parseLayoutAnimationConfig(
+    folly::dynamic const &config) {
   if (config.empty() || !config.isObject()) {
     return {};
   }
@@ -187,17 +187,17 @@ parseLayoutAnimationConfig(folly::dynamic const &config) {
 
   const auto createConfigIt = config.find("create");
   const auto createConfig = createConfigIt == config.items().end()
-      ? butter::optional<AnimationConfig>(AnimationConfig{})
+      ? std::optional<AnimationConfig>(AnimationConfig{})
       : parseAnimationConfig(createConfigIt->second, duration, true);
 
   const auto updateConfigIt = config.find("update");
   const auto updateConfig = updateConfigIt == config.items().end()
-      ? butter::optional<AnimationConfig>(AnimationConfig{})
+      ? std::optional<AnimationConfig>(AnimationConfig{})
       : parseAnimationConfig(updateConfigIt->second, duration, false);
 
   const auto deleteConfigIt = config.find("delete");
   const auto deleteConfig = deleteConfigIt == config.items().end()
-      ? butter::optional<AnimationConfig>(AnimationConfig{})
+      ? std::optional<AnimationConfig>(AnimationConfig{})
       : parseAnimationConfig(deleteConfigIt->second, duration, true);
 
   if (!createConfig || !updateConfig || !deleteConfig) {

package/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp

@@ -273,7 +273,7 @@ static void testShadowNodeTreeLifeCycleLayoutAnimations(
       auto transaction =
           animationDriver->pullTransaction(surfaceId, 0, telemetry, {});
       // We have something to validate.
-      if (transaction.hasValue()) {
+      if (transaction.has_value()) {
         auto mutations = transaction->getMutations();
 
         // Mutating the view tree.

package/ReactCommon/react/renderer/attributedstring/Android.mk

@@ -25,8 +25,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libbutter \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_debug \
   libreact_render_core \

package/ReactCommon/react/renderer/attributedstring/BUCK

@@ -37,7 +37,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/renderer/attributedstring/CMakeLists.txt

@@ -0,0 +1,29 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_render_attributedstring_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_render_attributedstring SHARED ${react_render_attributedstring_SRC})
+
+target_include_directories(react_render_attributedstring PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_render_attributedstring
+        butter
+        folly_runtime
+        glog
+        glog_init
+        react_debug
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_mapbuffer
+        react_utils
+        rrc_view
+        yoga
+)

package/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp

@@ -37,20 +37,20 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   fontSizeMultiplier = !std::isnan(textAttributes.fontSizeMultiplier)
       ? textAttributes.fontSizeMultiplier
       : fontSizeMultiplier;
-  fontWeight = textAttributes.fontWeight.hasValue() ? textAttributes.fontWeight
-                                                    : fontWeight;
-  fontStyle = textAttributes.fontStyle.hasValue() ? textAttributes.fontStyle
-                                                  : fontStyle;
-  fontVariant = textAttributes.fontVariant.hasValue()
+  fontWeight = textAttributes.fontWeight.has_value() ? textAttributes.fontWeight
+                                                     : fontWeight;
+  fontStyle = textAttributes.fontStyle.has_value() ? textAttributes.fontStyle
+                                                   : fontStyle;
+  fontVariant = textAttributes.fontVariant.has_value()
       ? textAttributes.fontVariant
       : fontVariant;
-  allowFontScaling = textAttributes.allowFontScaling.hasValue()
+  allowFontScaling = textAttributes.allowFontScaling.has_value()
       ? textAttributes.allowFontScaling
       : allowFontScaling;
   letterSpacing = !std::isnan(textAttributes.letterSpacing)
       ? textAttributes.letterSpacing
       : letterSpacing;
-  textTransform = textAttributes.textTransform.hasValue()
+  textTransform = textAttributes.textTransform.has_value()
       ? textAttributes.textTransform
       : textTransform;
 
@@ -58,9 +58,9 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   lineHeight = !std::isnan(textAttributes.lineHeight)
       ? textAttributes.lineHeight
       : lineHeight;
-  alignment = textAttributes.alignment.hasValue() ? textAttributes.alignment
-                                                  : alignment;
-  baseWritingDirection = textAttributes.baseWritingDirection.hasValue()
+  alignment = textAttributes.alignment.has_value() ? textAttributes.alignment
+                                                   : alignment;
+  baseWritingDirection = textAttributes.baseWritingDirection.has_value()
       ? textAttributes.baseWritingDirection
       : baseWritingDirection;
 
@@ -68,15 +68,15 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   textDecorationColor = textAttributes.textDecorationColor
       ? textAttributes.textDecorationColor
       : textDecorationColor;
-  textDecorationLineType = textAttributes.textDecorationLineType.hasValue()
+  textDecorationLineType = textAttributes.textDecorationLineType.has_value()
       ? textAttributes.textDecorationLineType
       : textDecorationLineType;
-  textDecorationStyle = textAttributes.textDecorationStyle.hasValue()
+  textDecorationStyle = textAttributes.textDecorationStyle.has_value()
       ? textAttributes.textDecorationStyle
       : textDecorationStyle;
 
   // Shadow
-  textShadowOffset = textAttributes.textShadowOffset.hasValue()
+  textShadowOffset = textAttributes.textShadowOffset.has_value()
       ? textAttributes.textShadowOffset.value()
       : textShadowOffset;
   textShadowRadius = !std::isnan(textAttributes.textShadowRadius)
@@ -87,13 +87,13 @@ void TextAttributes::apply(TextAttributes textAttributes) {
       : textShadowColor;
 
   // Special
-  isHighlighted = textAttributes.isHighlighted.hasValue()
+  isHighlighted = textAttributes.isHighlighted.has_value()
       ? textAttributes.isHighlighted
       : isHighlighted;
-  layoutDirection = textAttributes.layoutDirection.hasValue()
+  layoutDirection = textAttributes.layoutDirection.has_value()
       ? textAttributes.layoutDirection
       : layoutDirection;
-  accessibilityRole = textAttributes.accessibilityRole.hasValue()
+  accessibilityRole = textAttributes.accessibilityRole.has_value()
       ? textAttributes.accessibilityRole
       : accessibilityRole;
 }

package/ReactCommon/react/renderer/attributedstring/TextAttributes.h

@@ -9,8 +9,8 @@
 
 #include <functional>
 #include <limits>
+#include <optional>
 
-#include <butter/optional.h>
 #include <folly/Hash.h>
 #include <react/renderer/attributedstring/primitives.h>
 #include <react/renderer/core/LayoutPrimitives.h>
@@ -46,38 +46,38 @@ class TextAttributes : public DebugStringConvertible {
   std::string fontFamily{""};
   Float fontSize{std::numeric_limits<Float>::quiet_NaN()};
   Float fontSizeMultiplier{std::numeric_limits<Float>::quiet_NaN()};
-  butter::optional<FontWeight> fontWeight{};
-  butter::optional<FontStyle> fontStyle{};
-  butter::optional<FontVariant> fontVariant{};
-  butter::optional<bool> allowFontScaling{};
+  std::optional<FontWeight> fontWeight{};
+  std::optional<FontStyle> fontStyle{};
+  std::optional<FontVariant> fontVariant{};
+  std::optional<bool> allowFontScaling{};
   Float letterSpacing{std::numeric_limits<Float>::quiet_NaN()};
-  butter::optional<TextTransform> textTransform{};
+  std::optional<TextTransform> textTransform{};
 
   // Paragraph Styles
   Float lineHeight{std::numeric_limits<Float>::quiet_NaN()};
-  butter::optional<TextAlignment> alignment{};
-  butter::optional<WritingDirection> baseWritingDirection{};
+  std::optional<TextAlignment> alignment{};
+  std::optional<WritingDirection> baseWritingDirection{};
 
   // Decoration
   SharedColor textDecorationColor{};
-  butter::optional<TextDecorationLineType> textDecorationLineType{};
-  butter::optional<TextDecorationStyle> textDecorationStyle{};
+  std::optional<TextDecorationLineType> textDecorationLineType{};
+  std::optional<TextDecorationStyle> textDecorationStyle{};
 
   // Shadow
   // TODO: Use `Point` type instead of `Size` for `textShadowOffset` attribute.
-  butter::optional<Size> textShadowOffset{};
+  std::optional<Size> textShadowOffset{};
   Float textShadowRadius{std::numeric_limits<Float>::quiet_NaN()};
   SharedColor textShadowColor{};
 
   // Special
-  butter::optional<bool> isHighlighted{};
+  std::optional<bool> isHighlighted{};
 
   // TODO T59221129: document where this value comes from and how it is set.
   // It's not clear if this is being used properly, or if it's being set at all.
   // Currently, it is intentionally *not* being set as part of BaseTextProps
   // construction.
-  butter::optional<LayoutDirection> layoutDirection{};
-  butter::optional<AccessibilityRole> accessibilityRole{};
+  std::optional<LayoutDirection> layoutDirection{};
+  std::optional<AccessibilityRole> accessibilityRole{};
 
 #pragma mark - Operations
 

package/ReactCommon/react/renderer/attributedstring/conversions.h

@@ -827,11 +827,11 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
   auto _textAttributes = folly::dynamic::object();
   if (textAttributes.foregroundColor) {
     _textAttributes(
-        "foregroundColor", toDynamic(textAttributes.foregroundColor));
+        "foregroundColor", toAndroidRepr(textAttributes.foregroundColor));
   }
   if (textAttributes.backgroundColor) {
     _textAttributes(
-        "backgroundColor", toDynamic(textAttributes.backgroundColor));
+        "backgroundColor", toAndroidRepr(textAttributes.backgroundColor));
   }
   if (!std::isnan(textAttributes.opacity)) {
     _textAttributes("opacity", textAttributes.opacity);
@@ -860,7 +860,7 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
   if (!std::isnan(textAttributes.letterSpacing)) {
     _textAttributes("letterSpacing", textAttributes.letterSpacing);
   }
-  if (textAttributes.textTransform.hasValue()) {
+  if (textAttributes.textTransform.has_value()) {
     _textAttributes("textTransform", toString(*textAttributes.textTransform));
   }
   if (!std::isnan(textAttributes.lineHeight)) {
@@ -876,7 +876,8 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
   // Decoration
   if (textAttributes.textDecorationColor) {
     _textAttributes(
-        "textDecorationColor", toDynamic(textAttributes.textDecorationColor));
+        "textDecorationColor",
+        toAndroidRepr(textAttributes.textDecorationColor));
   }
   if (textAttributes.textDecorationLineType.has_value()) {
     _textAttributes(
@@ -894,7 +895,7 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
   }
   if (textAttributes.textShadowColor) {
     _textAttributes(
-        "textShadowColor", toDynamic(textAttributes.textShadowColor));
+        "textShadowColor", toAndroidRepr(textAttributes.textShadowColor));
   }
   // Special
   if (textAttributes.isHighlighted.has_value()) {
@@ -976,7 +977,7 @@ constexpr static MapBuffer::Key TA_KEY_BEST_WRITING_DIRECTION = 13;
 constexpr static MapBuffer::Key TA_KEY_TEXT_DECORATION_COLOR = 14;
 constexpr static MapBuffer::Key TA_KEY_TEXT_DECORATION_LINE = 15;
 constexpr static MapBuffer::Key TA_KEY_TEXT_DECORATION_STYLE = 16;
-constexpr static MapBuffer::Key TA_KEY_TEXT_SHADOW_RAIDUS = 18;
+constexpr static MapBuffer::Key TA_KEY_TEXT_SHADOW_RADIUS = 18;
 constexpr static MapBuffer::Key TA_KEY_TEXT_SHADOW_COLOR = 19;
 constexpr static MapBuffer::Key TA_KEY_IS_HIGHLIGHTED = 20;
 constexpr static MapBuffer::Key TA_KEY_LAYOUT_DIRECTION = 21;
@@ -1036,11 +1037,11 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
   auto builder = MapBufferBuilder();
   if (textAttributes.foregroundColor) {
     builder.putInt(
-        TA_KEY_FOREGROUND_COLOR, toMapBuffer(textAttributes.foregroundColor));
+        TA_KEY_FOREGROUND_COLOR, toAndroidRepr(textAttributes.foregroundColor));
   }
   if (textAttributes.backgroundColor) {
     builder.putInt(
-        TA_KEY_BACKGROUND_COLOR, toMapBuffer(textAttributes.backgroundColor));
+        TA_KEY_BACKGROUND_COLOR, toAndroidRepr(textAttributes.backgroundColor));
   }
   if (!std::isnan(textAttributes.opacity)) {
     builder.putDouble(TA_KEY_OPACITY, textAttributes.opacity);
@@ -1087,7 +1088,7 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
   if (textAttributes.textDecorationColor) {
     builder.putInt(
         TA_KEY_TEXT_DECORATION_COLOR,
-        toMapBuffer(textAttributes.textDecorationColor));
+        toAndroidRepr(textAttributes.textDecorationColor));
   }
   if (textAttributes.textDecorationLineType.has_value()) {
     builder.putString(
@@ -1103,11 +1104,12 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
   // Shadow
   if (!std::isnan(textAttributes.textShadowRadius)) {
     builder.putDouble(
-        TA_KEY_TEXT_SHADOW_RAIDUS, textAttributes.textShadowRadius);
+        TA_KEY_TEXT_SHADOW_RADIUS, textAttributes.textShadowRadius);
   }
   if (textAttributes.textShadowColor) {
     builder.putInt(
-        TA_KEY_TEXT_SHADOW_COLOR, toMapBuffer(textAttributes.textShadowColor));
+        TA_KEY_TEXT_SHADOW_COLOR,
+        toAndroidRepr(textAttributes.textShadowColor));
   }
   // Special
   if (textAttributes.isHighlighted.has_value()) {

package/ReactCommon/react/renderer/componentregistry/Android.mk

@@ -17,8 +17,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SHARED_LIBRARIES := \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
@@ -26,6 +25,7 @@ LOCAL_SHARED_LIBRARIES := \
   libreact_render_debug \
   libreact_utils
 
+
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 

package/ReactCommon/react/renderer/componentregistry/BUCK

@@ -33,7 +33,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/renderer/componentregistry/CMakeLists.txt

@@ -0,0 +1,24 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_render_componentregistry_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_render_componentregistry SHARED ${react_render_componentregistry_SRC})
+
+target_include_directories(react_render_componentregistry PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_render_componentregistry
+        folly_runtime
+        glog_init
+        jsi
+        react_debug
+        react_render_core
+        react_render_debug
+        react_utils
+)

package/ReactCommon/react/renderer/componentregistry/native/Android.mk

@@ -17,8 +17,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 
 LOCAL_SHARED_LIBRARIES := \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \

package/ReactCommon/react/renderer/componentregistry/native/BUCK

@@ -32,7 +32,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt

@@ -0,0 +1,24 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB rrc_native_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rrc_native SHARED ${rrc_native_SRC})
+
+target_include_directories(rrc_native PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(rrc_native
+        folly_runtime
+        glog_init
+        jsi
+        react_debug
+        react_render_core
+        react_render_debug
+        react_utils
+)

package/ReactCommon/react/renderer/components/image/Android.mk

@@ -24,7 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \

package/ReactCommon/react/renderer/components/image/BUCK

@@ -34,7 +34,10 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/renderer/components/image/CMakeLists.txt

@@ -0,0 +1,29 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB rrc_image_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rrc_image SHARED ${rrc_image_SRC})
+
+target_include_directories(rrc_image PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(rrc_image
+        glog
+        folly_runtime
+        glog_init
+        jsi
+        react_debug
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_imagemanager
+        react_render_mapbuffer
+        rrc_view
+        yoga
+)

package/ReactCommon/react/renderer/components/inputaccessory/BUCK

@@ -27,7 +27,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",