react-native 0.71.4 → 0.72.0-rc.0

package/ReactCommon/React-Fabric.podspec

@@ -28,13 +28,18 @@ Pod::Spec.new do |s|
   s.summary                = "Fabric for React Native."
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "dummyFile.cpp"
   s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
                             "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
 
+  if ENV['USE_FRAMEWORKS']
+    s.header_mappings_dir     = './'
+    s.module_name             = 'React_Fabric'
+  end
+
   s.dependency folly_dep_name, folly_version
   s.dependency "React-graphics", version
   s.dependency "React-jsiexecutor", version
@@ -49,7 +54,6 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/animations/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/animations/tests"
     ss.header_dir           = "react/renderer/animations"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "attributedstring" do |ss|
@@ -58,7 +62,6 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/attributedstring/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/attributedstring/tests"
     ss.header_dir           = "react/renderer/attributedstring"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "butter" do |ss|
@@ -67,22 +70,39 @@ Pod::Spec.new do |s|
     ss.source_files         = "butter/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "butter/tests"
     ss.header_dir           = "butter"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "config" do |ss|
     ss.source_files         = "react/config/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/config"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
   end
 
   s.subspec "core" do |ss|
+    header_search_path = [
+      "\"$(PODS_ROOT)/boost\"",
+      "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
+      "\"$(PODS_ROOT)/RCT-Folly\"",
+    ]
+
+    if ENV['USE_FRAMEWORKS']
+      header_search_path = header_search_path + [
+        "\"$(PODS_TARGET_SRCROOT)\"",
+        "\"$(PODS_ROOT)/DoubleConversion\"",
+        "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\"",
+        "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/iostextinput\""
+      ]
+    end
+
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags + ' ' + boost_compiler_flags
     ss.source_files         = "react/renderer/core/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/core/tests"
     ss.header_dir           = "react/renderer/core"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    ss.pod_target_xcconfig  = {
+      "HEADER_SEARCH_PATHS" => header_search_path.join(" ")
+    }
   end
 
   s.subspec "componentregistry" do |ss|
@@ -90,7 +110,6 @@ Pod::Spec.new do |s|
     ss.compiler_flags       = folly_compiler_flags
     ss.source_files         = "react/renderer/componentregistry/**/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/renderer/componentregistry"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "componentregistrynative" do |ss|
@@ -98,7 +117,6 @@ Pod::Spec.new do |s|
     ss.compiler_flags       = folly_compiler_flags
     ss.source_files         = "react/renderer/componentregistry/native/**/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/renderer/componentregistry/native"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "components" do |ss|
@@ -108,7 +126,6 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/activityindicator/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/activityindicator/tests"
       sss.header_dir           = "react/renderer/components/activityindicator"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "image" do |sss|
@@ -117,7 +134,6 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/image/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/image/tests"
       sss.header_dir           = "react/renderer/components/image"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "inputaccessory" do |sss|
@@ -126,7 +142,6 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/inputaccessory/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/inputaccessory/tests"
       sss.header_dir           = "react/renderer/components/inputaccessory"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "legacyviewmanagerinterop" do |sss|
@@ -135,7 +150,7 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/legacyviewmanagerinterop/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/legacyviewmanagerinterop/tests"
       sss.header_dir           = "react/renderer/components/legacyviewmanagerinterop"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"" }
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\"" }
     end
 
     ss.subspec "modal" do |sss|
@@ -144,7 +159,13 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/modal/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/modal/tests"
       sss.header_dir           = "react/renderer/components/modal"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    end
+
+    ss.subspec "rncore" 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"
     end
 
     ss.subspec "root" do |sss|
@@ -153,7 +174,6 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/root/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/root/tests"
       sss.header_dir           = "react/renderer/components/root"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "safeareaview" do |sss|
@@ -162,7 +182,7 @@ 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"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+
     end
 
     ss.subspec "scrollview" do |sss|
@@ -171,17 +191,7 @@ 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"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
-    end
 
-    ss.subspec "slider" do |sss|
-      sss.dependency             folly_dep_name, folly_version
-      sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "react/renderer/components/slider/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "react/renderer/components/slider/tests/**/*",
-                                 "react/renderer/components/slider/platform/android"
-      sss.header_dir           = "react/renderer/components/slider"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "text" do |sss|
@@ -190,7 +200,7 @@ 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"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+
     end
 
     ss.subspec "textinput" do |sss|
@@ -199,7 +209,7 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/textinput/iostextinput/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/textinput/iostextinput/tests"
       sss.header_dir           = "react/renderer/components/iostextinput"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+
     end
 
     ss.subspec "unimplementedview" do |sss|
@@ -208,7 +218,7 @@ 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"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+
     end
 
     ss.subspec "view" do |sss|
@@ -218,7 +228,7 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/view/tests"
       sss.header_dir           = "react/renderer/components/view"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+
     end
   end
 
@@ -228,7 +238,6 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/debug/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/debug/tests"
     ss.header_dir           = "react/debug"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "debug_renderer" do |ss|
@@ -237,19 +246,13 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/debug/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/debug/tests"
     ss.header_dir           = "react/renderer/debug"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "imagemanager" do |ss|
-    ss.dependency             "React-RCTImage", version
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
-    ss.source_files         = "react/renderer/imagemanager/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "react/renderer/imagemanager/tests",
-                              "react/renderer/imagemanager/platform/android",
-                              "react/renderer/imagemanager/platform/cxx"
+    ss.source_files         = "react/renderer/imagemanager/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/renderer/imagemanager"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "mapbuffer" do |ss|
@@ -258,7 +261,6 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/mapbuffer/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/mapbuffer/tests"
     ss.header_dir           = "react/renderer/mapbuffer"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "mounting" do |ss|
@@ -267,7 +269,6 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/mounting/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/mounting/tests"
     ss.header_dir           = "react/renderer/mounting"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "scheduler" do |ss|
@@ -275,7 +276,6 @@ Pod::Spec.new do |s|
     ss.compiler_flags       = folly_compiler_flags
     ss.source_files         = "react/renderer/scheduler/**/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/renderer/scheduler"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "templateprocessor" do |ss|
@@ -284,7 +284,6 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/templateprocessor/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/templateprocessor/tests"
     ss.header_dir           = "react/renderer/templateprocessor"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "textlayoutmanager" do |ss|
@@ -297,7 +296,6 @@ Pod::Spec.new do |s|
                               "react/renderer/textlayoutmanager/platform/android",
                               "react/renderer/textlayoutmanager/platform/cxx"
     ss.header_dir           = "react/renderer/textlayoutmanager"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "uimanager" do |ss|
@@ -306,7 +304,6 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/uimanager/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/uimanager/tests"
     ss.header_dir           = "react/renderer/uimanager"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "telemetry" do |ss|
@@ -315,7 +312,7 @@ 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"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+
   end
 
   s.subspec "leakchecker" do |ss|
@@ -324,8 +321,7 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/leakchecker/**/*.{cpp,h}"
     ss.exclude_files        = "react/renderer/leakchecker/tests"
     ss.header_dir           = "react/renderer/leakchecker"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"",
-                                "GCC_WARN_PEDANTIC" => "YES" }
+    ss.pod_target_xcconfig  = { "GCC_WARN_PEDANTIC" => "YES" }
   end
 
   s.subspec "runtimescheduler" do |ss|
@@ -334,14 +330,12 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/runtimescheduler/**/*.{cpp,h}"
     ss.exclude_files        = "react/renderer/runtimescheduler/tests"
     ss.header_dir           = "react/renderer/runtimescheduler"
-    ss.pod_target_xcconfig  = {"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"",
-                               "GCC_WARN_PEDANTIC" => "YES" }
+    ss.pod_target_xcconfig  = { "GCC_WARN_PEDANTIC" => "YES" }
   end
 
   s.subspec "utils" do |ss|
     ss.source_files         = "react/utils/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/utils"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\""}
   end
 
 end

package/ReactCommon/React-rncore.podspec

@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
   s.summary                = "Fabric for React Native."
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "dummyFile.cpp"
@@ -37,5 +37,6 @@ Pod::Spec.new do |s|
     :js_srcs_dir => "#{react_native_path}/Libraries",
     :library_name => "rncore",
     :library_type => "components",
+    :output_dir => "#{react_native_path}/react-native/ReactCommon"
   })
 end

package/ReactCommon/ReactCommon.podspec

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.summary                = "-"  # TODO
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
@@ -36,13 +36,15 @@ Pod::Spec.new do |s|
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                "GCC_WARN_PEDANTIC" => "YES" }
+  if ENV['USE_FRAMEWORKS']
+    s.header_mappings_dir     = './'
+  end
 
   # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
   # Note: Update this only when ready to minimize breaking changes.
   s.subspec "turbomodule" do |ss|
     ss.dependency "React-callinvoker", version
     ss.dependency "React-perflogger", version
-    ss.dependency "React-Core", version
     ss.dependency "React-cxxreact", version
     ss.dependency "React-jsi", version
     ss.dependency "RCT-Folly", folly_version
@@ -65,22 +67,11 @@ Pod::Spec.new do |s|
     end
 
     ss.subspec "core" do |sss|
-      sss.source_files = "react/nativemodule/core/ReactCommon/**/*.{cpp,h}",
-                         "react/nativemodule/core/platform/ios/**/*.{mm,cpp,h}"
-      excluded_files = ENV['USE_FRAMEWORKS'] == nil ?
-        "react/nativemodule/core/ReactCommon/LongLivedObject.h" :
-        "react/nativemodule/core/ReactCommon/{LongLivedObject,CallbackWrapper}.h"
-      sss.exclude_files = excluded_files
-    end
-
-    s.subspec "react_debug_core" do |sss|
-        sss.source_files = "react/debug/*.{cpp,h}"
+      sss.source_files = "react/nativemodule/core/ReactCommon/**/*.{cpp,h}"
     end
+  end
 
-    ss.subspec "samples" do |sss|
-      sss.source_files = "react/nativemodule/samples/ReactCommon/**/*.{cpp,h}",
-                         "react/nativemodule/samples/platform/ios/**/*.{mm,cpp,h}"
-      sss.dependency "ReactCommon/turbomodule/core", version
-    end
+  s.subspec "react_debug_core" do |sss|
+    sss.source_files = "react/debug/*.{cpp,h}"
   end
 end

package/ReactCommon/butter/BUCK

@@ -14,14 +14,6 @@ APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "butter",
-    srcs = glob(
-        ["**/*.cpp"],
-        exclude = glob(["tests/**/*.cpp"]),
-    ),
-    headers = glob(
-        ["**/*.h"],
-        exclude = glob(["tests/**/*.h"]),
-    ),
     header_namespace = "",
     exported_headers = subdir_glob(
         [
@@ -47,9 +39,9 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:container_f14_hash",
         "//xplat/folly:memory",
         "//xplat/folly:shared_mutex",
         "//xplat/folly:small_vector",
+        "//xplat/folly/container:f14_hash",
     ],
 )

package/ReactCommon/butter/function.h

@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <butter/butter.h>
+
+#if (                                            \
+    defined(BUTTER_FUNCTION_OVERRIDE_INCLUDE) && \
+    defined(BUTTER_FUNCTION_OVERRIDE))
+
+#include BUTTER_FUNCTION_OVERRIDE_INCLUDE
+
+#elif defined(BUTTER_USE_FOLLY_CONTAINERS)
+
+#include <folly/Function.h>
+
+#else
+
+#include <functional>
+
+#endif
+
+namespace facebook {
+namespace butter {
+
+#if (                                            \
+    defined(BUTTER_FUNCTION_OVERRIDE_INCLUDE) && \
+    defined(BUTTER_FUNCTION_OVERRIDE))
+
+template <typename... Ts>
+using function = BUTTER_FUNCTION_OVERRIDE<Ts...>;
+
+#elif defined(BUTTER_USE_FOLLY_CONTAINERS)
+
+template <typename... Ts>
+using function = folly::Function<Ts...>;
+
+#else
+
+template <typename... Ts>
+using function = std::function<Ts...>;
+
+#endif
+
+} // namespace butter
+} // namespace facebook

package/ReactCommon/butter/map.h

@@ -23,9 +23,9 @@ namespace facebook {
 namespace butter {
 
 /*
- * Note: In Butter, `map` aliases to `unorderd_map` because everyone agrees that
- * an *ordered* map is nonsense and was a huge mistake for standardization. If
- * you need an *ordered* map, feel free to introduce that as
+ * Note: In Butter, `map` aliases to `unordered_map` because everyone agrees
+ * that an *ordered* map is nonsense and was a huge mistake for standardization.
+ * If you need an *ordered* map, feel free to introduce that as
  * `butter::ordered_map`.
  */
 

package/ReactCommon/callinvoker/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

package/ReactCommon/callinvoker/BUCK

@@ -2,7 +2,6 @@ load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "CXX", "rn_xplat_
 
 rn_xplat_cxx_library(
     name = "callinvoker",
-    srcs = glob(["**/*.cpp"]),
     header_namespace = "",
     exported_headers = subdir_glob(
         [

package/ReactCommon/callinvoker/React-callinvoker.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.summary                = "-"  # TODO
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"

package/ReactCommon/callinvoker/ReactCommon/CallInvoker.h

@@ -10,17 +10,26 @@
 #include <functional>
 #include <memory>
 
+#include "SchedulerPriority.h"
+
 namespace facebook {
 namespace react {
 
+using CallFunc = std::function<void()>;
+
 /**
  * An interface for a generic native-to-JS call invoker. See BridgeJSCallInvoker
  * for an implementation.
  */
 class CallInvoker {
  public:
-  virtual void invokeAsync(std::function<void()> &&func) = 0;
-  virtual void invokeSync(std::function<void()> &&func) = 0;
+  virtual void invokeAsync(CallFunc &&func) = 0;
+  virtual void invokeAsync(SchedulerPriority /*priority*/, CallFunc &&func) {
+    // When call with priority is not implemented, fall back to a regular async
+    // execution
+    invokeAsync(std::move(func));
+  }
+  virtual void invokeSync(CallFunc &&func) = 0;
   virtual ~CallInvoker() {}
 };
 

package/ReactCommon/{butter/mutex.h → callinvoker/ReactCommon/SchedulerPriority.h}

@@ -7,14 +7,18 @@
 
 #pragma once
 
-#include <folly/SharedMutex.h>
-#include <mutex>
-#include <shared_mutex>
+#include <chrono>
 
 namespace facebook {
-namespace butter {
+namespace react {
 
-using shared_mutex = folly::SharedMutex;
+enum class SchedulerPriority : int {
+  ImmediatePriority = 1,
+  UserBlockingPriority = 2,
+  NormalPriority = 3,
+  LowPriority = 4,
+  IdlePriority = 5,
+};
 
-} // namespace butter
+} // namespace react
 } // namespace facebook

package/ReactCommon/cxxreact/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

package/ReactCommon/cxxreact/BUCK

@@ -123,6 +123,9 @@ rn_xplat_cxx_library(
         for header in CXXREACT_PUBLIC_HEADERS
     ]),
     compiler_flags_pedantic = True,
+    exported_preprocessor_flags = [
+        "-DWITH_FBSYSTRACE=1",
+    ],
     fbandroid_preprocessor_flags = get_android_inspector_flags(),
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     fbobjc_force_static = True,
@@ -134,7 +137,6 @@ rn_xplat_cxx_library(
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
-        "-DWITH_FBSYSTRACE=1",
     ],
     tests = [
         react_native_xplat_target("cxxreact/tests:tests"),

package/ReactCommon/cxxreact/CMakeLists.txt

@@ -9,6 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 add_compile_options(
         -fexceptions
         -frtti
+        -std=c++17
         -Wno-unused-lambda-capture
         -DLOG_TAG=\"ReactNative\")
 

package/ReactCommon/cxxreact/Instance.h

@@ -111,7 +111,7 @@ class RN_EXPORT Instance {
    *   When all queued NativeModule method calls are flushed by a call from
    *   Native -> JS, if that queue was non-zero in size, JsToNativeBridge
    *   dispatches onBatchComplete. When we turn our NativeModules to
-   *   TurboModuels, there will be less and less pending NativeModule method
+   *   TurboModules, there will be less and less pending NativeModule method
    *   calls, so onBatchComplete will not fire as often. Therefore, the bridge
    *   needs to know how many TurboModule async method calls have been completed
    *   since the last time the bridge was flushed. If this number is non-zero,
@@ -120,7 +120,7 @@ class RN_EXPORT Instance {
    * Why can't we just create and return a new native CallInvoker?
    *
    * - On Android, we have one NativeModule thread. That thread is created and
-   *   managed outisde of NativeToJsBridge. On iOS, we have one MethodQueue per
+   *   managed outside of NativeToJsBridge. On iOS, we have one MethodQueue per
    *   module. Those MethodQueues are also created and managed outside of
    *   NativeToJsBridge. Therefore, we need to pass in a CallInvoker that
    *   schedules work on the respective thread.

package/ReactCommon/cxxreact/JSBigString.h

@@ -126,11 +126,11 @@ class RN_EXPORT JSBigFileString : public JSBigString {
       const std::string &sourceURL);
 
  private:
-  int m_fd; // The file descriptor being mmaped
-  size_t m_size; // The size of the mmaped region
-  mutable off_t m_pageOff; // The offset in the mmaped region to the data.
-  off_t m_mapOff; // The offset in the file to the mmaped region.
-  mutable const char *m_data; // Pointer to the mmaped region.
+  int m_fd; // The file descriptor being mmapped
+  size_t m_size; // The size of the mmapped region
+  mutable off_t m_pageOff; // The offset in the mmapped region to the data.
+  off_t m_mapOff; // The offset in the file to the mmapped region.
+  mutable const char *m_data; // Pointer to the mmapped region.
 };
 
 } // namespace react