Cover react/renderer/debug with Stable API guards

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

@@ -146,6 +146,7 @@ val preparePrefab by
                       Pair("../ReactCommon/react/debug/", "react/debug/"),
                       // react_renderer_debug
                       Pair("../ReactCommon/react/renderer/debug/", "react/renderer/debug/"),
+                      Pair("../ReactCommon/react/renderer/debug/React/", "React/"),
                       // react_renderer_graphics
                       Pair("../ReactCommon/react/renderer/graphics/", "react/renderer/graphics/"),
                       Pair("../ReactCommon/react/renderer/graphics/platform/android/", ""),

packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt

@@ -12,7 +12,7 @@ file(GLOB react_renderer_debug_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_renderer_debug OBJECT ${react_renderer_debug_SRC})
 
 target_include_directories(react_renderer_debug PUBLIC ${REACT_COMMON_DIR})
-target_link_libraries(react_renderer_debug folly_runtime react_debug)
+target_link_libraries(react_renderer_debug folly_runtime react_cxxstableapi react_debug)
 target_compile_reactnative_options(react_renderer_debug PRIVATE)
 target_compile_options(react_renderer_debug PRIVATE -Wpedantic)
 

packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <react/cxxstableapi/UmbrellaGuard.h>
+
 #include <climits>
 #include <memory>
 #include <optional>

packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <react/cxxstableapi/UmbrellaGuard.h>
+
 #include <string>
 
 #include <react/renderer/debug/DebugStringConvertible.h>

packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec

@@ -31,9 +31,8 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = podspec_sources("**/*.{cpp,h,mm}", "**/*.h")
+  s.source_files           = podspec_sources("*.{cpp,h,mm}", "*.h")
   s.header_dir             = "react/renderer/debug"
-  s.exclude_files          = "tests"
   s.pod_target_xcconfig    = {
     "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
     "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
@@ -46,5 +45,13 @@ Pod::Spec.new do |s|
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)
 
+  s.dependency "React-cxxstableapi"
+
+  s.subspec "debugUmbrella" do |ss|
+    ss.source_files        = "React/*.h"
+    ss.header_dir          = "React"
+    ss.header_mappings_dir = "React"
+  end
+
   mark_as_react_native_build(s)
 end

packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h

@@ -0,0 +1,30 @@
+/*
+ * 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
+
+// =============================================================================
+// Umbrella header for the `react/renderer/debug` module - public entry point.
+//
+//   #include <React/RendererDebug.h>
+//
+// Re-exports the module's public interface headers. React Native's own code
+// should keep using the fine-grained `<react/renderer/debug/...>` includes;
+// only outside consumers use this umbrella.
+// =============================================================================
+
+// Marks that the following headers are pulled in through the umbrella, so their
+// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them. Scoped to
+// this block so later *direct* includes in the same TU are still caught.
+#define RN_UMBRELLA_CONTEXT
+
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/debug/DebugStringConvertibleItem.h>
+#include <react/renderer/debug/debugStringConvertibleUtils.h>
+#include <react/renderer/debug/flags.h>
+
+#undef RN_UMBRELLA_CONTEXT

packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <react/cxxstableapi/UmbrellaGuard.h>
+
 #include <memory>
 #include <optional>
 #include <string>

packages/react-native/ReactCommon/react/renderer/debug/flags.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <react/cxxstableapi/UmbrellaGuard.h>
+
 #include <react/debug/flags.h>
 
 //

packages/react-native/scripts/ios-prebuild/headers-config.js

@@ -597,6 +597,23 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
   'Libraries/PushNotificationIOS/React-RCTPushNotification.podspec': {
     disabled: true,
   },
+  'ReactCommon/react/renderer/debug/React-rendererdebug.podspec': {
+    name: 'React-rendererdebug',
+    headerPatterns: [],
+    headerDir: '',
+    subSpecs: [
+      {
+        name: 'debug',
+        headerPatterns: ['*.h'],
+        headerDir: 'react/renderer/debug',
+      },
+      {
+        name: 'debugUmbrella',
+        headerPatterns: ['React/*.h'],
+        headerDir: 'React',
+      },
+    ],
+  },
 };
 
 module.exports = {PodspecExceptions};