Skip to content

Commit 66e43fc

Browse files
coadometa-codesync[bot]
coado
authored and
meta-codesync[bot]
committed
Classify cxxreact/JSBundleType.h as for-frameworks (#58956)
Summary: Pull Request resolved: #58956 `JSBundleType.h` exposes bundle-format detection internals (`BundleHeader`, `ScriptTag`, `parseTypeFromHeader`, `isHermesBytecodeBundle`). Within React Native it is only used by the bundle loaders, but out-of-tree platforms read `BundleHeader` directly, so it is classified as "for frameworks" rather than private. Remove `JSBundleType.h` from the `<React/JSBigString.h>` umbrella: a public umbrella that includes it would keep its symbols public regardless of its guard. Frameworks include `<cxxreact/JSBundleType.h>` directly. The C++ API snapshots are regenerated: these symbols are removed from the Debug, Release and Newarch snapshots and stay in the Frameworks snapshots. Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D124104985
1 parent d4e733c commit 66e43fc

11 files changed

Lines changed: 1 addition & 182 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <folly/Portability.h>
1313
#include <cstdint>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#define RN_UMBRELLA_CONTEXT 1
3232

3333
#include <cxxreact/JSBigString.h>
34-
#include <cxxreact/JSBundleType.h>
3534

3635
#undef RN_UMBRELLA_CONTEXT
3736
#pragma pop_macro("RN_UMBRELLA_CONTEXT")

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
491491
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
492492
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
493493
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
494-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
495494
bool facebook::react::isZero(facebook::react::Float n);
496-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
497495
constexpr auto facebook::react::to_underlying(auto e) noexcept;
498496
constexpr char facebook::react::toLower(char c);
499497
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -510,7 +508,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
510508
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
511509
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
512510
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
513-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
514511
facebook::react::SharedColor facebook::react::blackColor();
515512
facebook::react::SharedColor facebook::react::clearColor();
516513
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -3004,11 +3001,6 @@ enum facebook::react::SchedulerPriority : int {
30043001
UserBlockingPriority,
30053002
}
30063003

3007-
enum facebook::react::ScriptTag {
3008-
RAMBundle,
3009-
String,
3010-
}
3011-
30123004
enum facebook::react::TransformOperationType : uint8_t {
30133005
Arbitrary,
30143006
Identity,
@@ -3170,13 +3162,6 @@ struct facebook::react::Bridging<void> {
31703162
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31713163
}
31723164

3173-
struct facebook::react::BundleHeader {
3174-
public BundleHeader();
3175-
public facebook::react::Magic32 magic32;
3176-
public uint32_t version;
3177-
public uint64_t magic64;
3178-
}
3179-
31803165
struct facebook::react::Color {
31813166
public bool isDefined;
31823167
public constexpr Color() = default;
@@ -3391,11 +3376,6 @@ struct facebook::react::LinearGradient {
33913376
public std::vector<facebook::react::ColorStop> colorStops;
33923377
}
33933378

3394-
struct facebook::react::Magic32 {
3395-
public uint32_t reserved_;
3396-
public uint32_t value;
3397-
}
3398-
33993379
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
34003380
public facebook::react::ModalHostViewSupportedOrientationsMask value;
34013381
}

‎scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
491491
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
492492
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
493493
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
494-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
495494
bool facebook::react::isZero(facebook::react::Float n);
496-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
497495
constexpr auto facebook::react::to_underlying(auto e) noexcept;
498496
constexpr char facebook::react::toLower(char c);
499497
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -510,7 +508,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
510508
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
511509
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
512510
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
513-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
514511
facebook::react::SharedColor facebook::react::blackColor();
515512
facebook::react::SharedColor facebook::react::clearColor();
516513
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -2997,11 +2994,6 @@ enum facebook::react::SchedulerPriority : int {
29972994
UserBlockingPriority,
29982995
}
29992996

3000-
enum facebook::react::ScriptTag {
3001-
RAMBundle,
3002-
String,
3003-
}
3004-
30052997
enum facebook::react::TransformOperationType : uint8_t {
30062998
Arbitrary,
30072999
Identity,
@@ -3163,13 +3155,6 @@ struct facebook::react::Bridging<void> {
31633155
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31643156
}
31653157

3166-
struct facebook::react::BundleHeader {
3167-
public BundleHeader();
3168-
public facebook::react::Magic32 magic32;
3169-
public uint32_t version;
3170-
public uint64_t magic64;
3171-
}
3172-
31733158
struct facebook::react::Color {
31743159
public bool isDefined;
31753160
public constexpr Color() = default;
@@ -3384,11 +3369,6 @@ struct facebook::react::LinearGradient {
33843369
public std::vector<facebook::react::ColorStop> colorStops;
33853370
}
33863371

3387-
struct facebook::react::Magic32 {
3388-
public uint32_t reserved_;
3389-
public uint32_t value;
3390-
}
3391-
33923372
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
33933373
public facebook::react::ModalHostViewSupportedOrientationsMask value;
33943374
}

‎scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
491491
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
492492
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
493493
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
494-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
495494
bool facebook::react::isZero(facebook::react::Float n);
496-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
497495
constexpr auto facebook::react::to_underlying(auto e) noexcept;
498496
constexpr char facebook::react::toLower(char c);
499497
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -510,7 +508,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
510508
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
511509
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
512510
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
513-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
514511
facebook::react::SharedColor facebook::react::blackColor();
515512
facebook::react::SharedColor facebook::react::clearColor();
516513
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -2997,11 +2994,6 @@ enum facebook::react::SchedulerPriority : int {
29972994
UserBlockingPriority,
29982995
}
29992996

3000-
enum facebook::react::ScriptTag {
3001-
RAMBundle,
3002-
String,
3003-
}
3004-
30052997
enum facebook::react::TransformOperationType : uint8_t {
30062998
Arbitrary,
30072999
Identity,
@@ -3163,13 +3155,6 @@ struct facebook::react::Bridging<void> {
31633155
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31643156
}
31653157

3166-
struct facebook::react::BundleHeader {
3167-
public BundleHeader();
3168-
public facebook::react::Magic32 magic32;
3169-
public uint32_t version;
3170-
public uint64_t magic64;
3171-
}
3172-
31733158
struct facebook::react::Color {
31743159
public bool isDefined;
31753160
public constexpr Color() = default;
@@ -3384,11 +3369,6 @@ struct facebook::react::LinearGradient {
33843369
public std::vector<facebook::react::ColorStop> colorStops;
33853370
}
33863371

3387-
struct facebook::react::Magic32 {
3388-
public uint32_t reserved_;
3389-
public uint32_t value;
3390-
}
3391-
33923372
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
33933373
public facebook::react::ModalHostViewSupportedOrientationsMask value;
33943374
}

‎scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3269,9 +3269,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
32693269
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
32703270
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
32713271
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
3272-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
32733272
bool facebook::react::isZero(facebook::react::Float n);
3274-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
32753273
constexpr auto facebook::react::to_underlying(auto e) noexcept;
32763274
constexpr char facebook::react::toLower(char c);
32773275
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -3287,7 +3285,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
32873285
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
32883286
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
32893287
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
3290-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
32913288
facebook::react::SharedColor facebook::react::blackColor();
32923289
facebook::react::SharedColor facebook::react::clearColor();
32933290
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -5183,11 +5180,6 @@ enum facebook::react::SchedulerPriority : int {
51835180
UserBlockingPriority,
51845181
}
51855182

5186-
enum facebook::react::ScriptTag {
5187-
RAMBundle,
5188-
String,
5189-
}
5190-
51915183
enum facebook::react::TransformOperationType : uint8_t {
51925184
Arbitrary,
51935185
Identity,
@@ -5346,13 +5338,6 @@ struct facebook::react::Bridging<void> {
53465338
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53475339
}
53485340

5349-
struct facebook::react::BundleHeader {
5350-
public BundleHeader();
5351-
public facebook::react::Magic32 magic32;
5352-
public uint32_t version;
5353-
public uint64_t magic64;
5354-
}
5355-
53565341
struct facebook::react::Color {
53575342
public Color();
53585343
public Color(const facebook::react::ColorComponents& components);
@@ -5471,11 +5456,6 @@ struct facebook::react::LinearGradient {
54715456
public std::vector<facebook::react::ColorStop> colorStops;
54725457
}
54735458

5474-
struct facebook::react::Magic32 {
5475-
public uint32_t reserved_;
5476-
public uint32_t value;
5477-
}
5478-
54795459
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
54805460
public facebook::react::ModalHostViewSupportedOrientationsMask value;
54815461
}

‎scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3261,9 +3261,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
32613261
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
32623262
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
32633263
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
3264-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
32653264
bool facebook::react::isZero(facebook::react::Float n);
3266-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
32673265
constexpr auto facebook::react::to_underlying(auto e) noexcept;
32683266
constexpr char facebook::react::toLower(char c);
32693267
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -3279,7 +3277,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
32793277
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
32803278
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
32813279
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
3282-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
32833280
facebook::react::SharedColor facebook::react::blackColor();
32843281
facebook::react::SharedColor facebook::react::clearColor();
32853282
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -5168,11 +5165,6 @@ enum facebook::react::SchedulerPriority : int {
51685165
UserBlockingPriority,
51695166
}
51705167

5171-
enum facebook::react::ScriptTag {
5172-
RAMBundle,
5173-
String,
5174-
}
5175-
51765168
enum facebook::react::TransformOperationType : uint8_t {
51775169
Arbitrary,
51785170
Identity,
@@ -5331,13 +5323,6 @@ struct facebook::react::Bridging<void> {
53315323
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53325324
}
53335325

5334-
struct facebook::react::BundleHeader {
5335-
public BundleHeader();
5336-
public facebook::react::Magic32 magic32;
5337-
public uint32_t version;
5338-
public uint64_t magic64;
5339-
}
5340-
53415326
struct facebook::react::Color {
53425327
public Color();
53435328
public Color(const facebook::react::ColorComponents& components);
@@ -5456,11 +5441,6 @@ struct facebook::react::LinearGradient {
54565441
public std::vector<facebook::react::ColorStop> colorStops;
54575442
}
54585443

5459-
struct facebook::react::Magic32 {
5460-
public uint32_t reserved_;
5461-
public uint32_t value;
5462-
}
5463-
54645444
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
54655445
public facebook::react::ModalHostViewSupportedOrientationsMask value;
54665446
}

‎scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3269,9 +3269,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
32693269
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
32703270
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
32713271
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
3272-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
32733272
bool facebook::react::isZero(facebook::react::Float n);
3274-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
32753273
constexpr auto facebook::react::to_underlying(auto e) noexcept;
32763274
constexpr char facebook::react::toLower(char c);
32773275
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -3287,7 +3285,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
32873285
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
32883286
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
32893287
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
3290-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
32913288
facebook::react::SharedColor facebook::react::blackColor();
32923289
facebook::react::SharedColor facebook::react::clearColor();
32933290
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -5176,11 +5173,6 @@ enum facebook::react::SchedulerPriority : int {
51765173
UserBlockingPriority,
51775174
}
51785175

5179-
enum facebook::react::ScriptTag {
5180-
RAMBundle,
5181-
String,
5182-
}
5183-
51845176
enum facebook::react::TransformOperationType : uint8_t {
51855177
Arbitrary,
51865178
Identity,
@@ -5339,13 +5331,6 @@ struct facebook::react::Bridging<void> {
53395331
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53405332
}
53415333

5342-
struct facebook::react::BundleHeader {
5343-
public BundleHeader();
5344-
public facebook::react::Magic32 magic32;
5345-
public uint32_t version;
5346-
public uint64_t magic64;
5347-
}
5348-
53495334
struct facebook::react::Color {
53505335
public Color();
53515336
public Color(const facebook::react::ColorComponents& components);
@@ -5464,11 +5449,6 @@ struct facebook::react::LinearGradient {
54645449
public std::vector<facebook::react::ColorStop> colorStops;
54655450
}
54665451

5467-
struct facebook::react::Magic32 {
5468-
public uint32_t reserved_;
5469-
public uint32_t value;
5470-
}
5471-
54725452
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
54735453
public facebook::react::ModalHostViewSupportedOrientationsMask value;
54745454
}

0 commit comments

Comments
 (0)