Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react-native/ReactAndroid/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ val preparePrefab by
// Exported because the public cxxreact/ErrorUtils.h includes it
Pair("../ReactCommon/jserrorhandler/", "jserrorhandler/"),
Pair("../ReactCommon/react/bridging/", "react/bridging/"),
Pair("../ReactCommon/react/bridging/React/", "React/"),
Pair("../ReactCommon/react/nativemodule/core/", ""),
Pair("../ReactCommon/react/nativemodule/core/platform/android/", ""),
Pair(
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/AString.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>

#include <string>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Array.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>

#include <array>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <span>
#include <string>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Base.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <jsi/jsi.h>
#include <react/bridging/Convert.h>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Bool.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>

namespace facebook::react {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Bridging.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/AString.h>
#include <react/bridging/Array.h>
#include <react/bridging/ArrayBuffer.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ add_library(react_bridging OBJECT ${react_bridging_SRC})

target_include_directories(react_bridging PUBLIC ${REACT_COMMON_DIR})

target_link_libraries(react_bridging jsi callinvoker react_timing)
target_link_libraries(react_bridging jsi callinvoker react_cxxstableapi react_timing)
target_compile_reactnative_options(react_bridging PRIVATE)
target_compile_options(react_bridging PRIVATE -Wpedantic)
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <jsi/jsi.h>

#include <memory>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Class.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>

namespace facebook::react::bridging {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Convert.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <jsi/jsi.h>

#include <optional>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Dynamic.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <folly/dynamic.h>
#include <jsi/JSIDynamic.h>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Error.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>

namespace facebook::react {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Function.h>
#include <functional>
#include <memory>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Function.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>
#include <react/bridging/CallbackWrapper.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>
#include <react/timing/primitives.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <jsi/jsi.h>
#include <memory>
#include <mutex>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Number.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>

namespace facebook::react {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Object.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/AString.h>
#include <react/bridging/Base.h>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Promise.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Error.h>
#include <react/bridging/Function.h>
#include <react/bridging/LongLivedObject.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Pod::Spec.new do |s|
s.platforms = min_supported_versions
s.source = source
s.source_files = podspec_sources("*.{cpp,h}", "*.h")
s.exclude_files = "React"
s.header_dir = "react/bridging"
s.pod_target_xcconfig = {
"USE_HEADERMAP" => "YES",
Expand All @@ -35,8 +36,15 @@ Pod::Spec.new do |s|

resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_bridging")

s.subspec "bridgingUmbrella" do |ss|
ss.source_files = "React/*.h"
ss.header_dir = ""
ss.header_mappings_dir = "."
end

s.dependency "React-jsi"
s.dependency "React-callinvoker"
s.dependency "React-cxxstableapi"
s.dependency "React-timing"

add_rn_third_party_dependencies(s)
Expand Down
41 changes: 41 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/React/Bridging.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* 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/bridging` module - public entry point.
//
// #include <React/Bridging.h>
// =============================================================================

#pragma push_macro("RN_UMBRELLA_CONTEXT")
#undef RN_UMBRELLA_CONTEXT
#define RN_UMBRELLA_CONTEXT 1

#include <react/bridging/AString.h>
#include <react/bridging/Array.h>
#include <react/bridging/ArrayBuffer.h>
#include <react/bridging/Base.h>
#include <react/bridging/Bool.h>
#include <react/bridging/Bridging.h>
#include <react/bridging/CallbackWrapper.h>
#include <react/bridging/Class.h>
#include <react/bridging/Convert.h>
#include <react/bridging/Dynamic.h>
#include <react/bridging/Error.h>
#include <react/bridging/EventEmitter.h>
#include <react/bridging/Function.h>
#include <react/bridging/HighResTimeStamp.h>
#include <react/bridging/LongLivedObject.h>
#include <react/bridging/Number.h>
#include <react/bridging/Object.h>
#include <react/bridging/Promise.h>
#include <react/bridging/Value.h>

#undef RN_UMBRELLA_CONTEXT
#pragma pop_macro("RN_UMBRELLA_CONTEXT")
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/bridging/Value.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/bridging/Base.h>

#include <memory>
Expand Down
22 changes: 21 additions & 1 deletion packages/react-native/scripts/ios-prebuild/headers-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
headerDir: 'jsi',
excludePatterns: ['**/test/*'],
},
'ReactCommon/react/bridging/React-bridging.podspec': {
name: 'React-bridging',
headerPatterns: ['**/*.h'],
excludePatterns: ['React/**'],
headerDir: 'react/bridging',
subSpecs: [
{
name: 'bridgingUmbrella',
headerPatterns: ['React/*.h'],
headerDir: 'React',
},
],
},
'ReactCommon/hermes/React-hermes.podspec': {
name: 'React-hermes',
headerPatterns: [
Expand Down Expand Up @@ -247,8 +260,15 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
{
name: 'bridging',
headerPatterns: ['react/bridging/**/*.h'],
excludePatterns: ['react/bridging/tests/**'],
excludePatterns: ['react/bridging/React/**', 'react/bridging/tests/**'],
headerDir: 'react/bridging',
subSpecs: [
{
name: 'bridgingUmbrella',
headerPatterns: ['react/bridging/React/*.h'],
headerDir: 'React',
},
],
},
{
name: 'core',
Expand Down
Loading