Skip to content

Commit 9824a9a

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 7d2b8fc commit 9824a9a

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);
@@ -3015,11 +3012,6 @@ enum facebook::react::SchedulerPriority : int {
30153012
UserBlockingPriority,
30163013
}
30173014

3018-
enum facebook::react::ScriptTag {
3019-
RAMBundle,
3020-
String,
3021-
}
3022-
30233015
enum facebook::react::TransformOperationType : uint8_t {
30243016
Arbitrary,
30253017
Identity,
@@ -3181,13 +3173,6 @@ struct facebook::react::Bridging<void> {
31813173
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31823174
}
31833175

3184-
struct facebook::react::BundleHeader {
3185-
public BundleHeader();
3186-
public facebook::react::Magic32 magic32;
3187-
public uint32_t version;
3188-
public uint64_t magic64;
3189-
}
3190-
31913176
struct facebook::react::Color {
31923177
public bool isDefined;
31933178
public constexpr Color() = default;
@@ -3416,11 +3401,6 @@ struct facebook::react::LinearGradient {
34163401
public std::vector<facebook::react::ColorStop> colorStops;
34173402
}
34183403

3419-
struct facebook::react::Magic32 {
3420-
public uint32_t reserved_;
3421-
public uint32_t value;
3422-
}
3423-
34243404
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
34253405
public facebook::react::ModalHostViewSupportedOrientationsMask value;
34263406
}

‎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);
@@ -3008,11 +3005,6 @@ enum facebook::react::SchedulerPriority : int {
30083005
UserBlockingPriority,
30093006
}
30103007

3011-
enum facebook::react::ScriptTag {
3012-
RAMBundle,
3013-
String,
3014-
}
3015-
30163008
enum facebook::react::TransformOperationType : uint8_t {
30173009
Arbitrary,
30183010
Identity,
@@ -3174,13 +3166,6 @@ struct facebook::react::Bridging<void> {
31743166
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31753167
}
31763168

3177-
struct facebook::react::BundleHeader {
3178-
public BundleHeader();
3179-
public facebook::react::Magic32 magic32;
3180-
public uint32_t version;
3181-
public uint64_t magic64;
3182-
}
3183-
31843169
struct facebook::react::Color {
31853170
public bool isDefined;
31863171
public constexpr Color() = default;
@@ -3409,11 +3394,6 @@ struct facebook::react::LinearGradient {
34093394
public std::vector<facebook::react::ColorStop> colorStops;
34103395
}
34113396

3412-
struct facebook::react::Magic32 {
3413-
public uint32_t reserved_;
3414-
public uint32_t value;
3415-
}
3416-
34173397
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
34183398
public facebook::react::ModalHostViewSupportedOrientationsMask value;
34193399
}

‎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);
@@ -3008,11 +3005,6 @@ enum facebook::react::SchedulerPriority : int {
30083005
UserBlockingPriority,
30093006
}
30103007

3011-
enum facebook::react::ScriptTag {
3012-
RAMBundle,
3013-
String,
3014-
}
3015-
30163008
enum facebook::react::TransformOperationType : uint8_t {
30173009
Arbitrary,
30183010
Identity,
@@ -3174,13 +3166,6 @@ struct facebook::react::Bridging<void> {
31743166
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31753167
}
31763168

3177-
struct facebook::react::BundleHeader {
3178-
public BundleHeader();
3179-
public facebook::react::Magic32 magic32;
3180-
public uint32_t version;
3181-
public uint64_t magic64;
3182-
}
3183-
31843169
struct facebook::react::Color {
31853170
public bool isDefined;
31863171
public constexpr Color() = default;
@@ -3409,11 +3394,6 @@ struct facebook::react::LinearGradient {
34093394
public std::vector<facebook::react::ColorStop> colorStops;
34103395
}
34113396

3412-
struct facebook::react::Magic32 {
3413-
public uint32_t reserved_;
3414-
public uint32_t value;
3415-
}
3416-
34173397
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
34183398
public facebook::react::ModalHostViewSupportedOrientationsMask value;
34193399
}

‎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);
@@ -5196,11 +5193,6 @@ enum facebook::react::SchedulerPriority : int {
51965193
UserBlockingPriority,
51975194
}
51985195

5199-
enum facebook::react::ScriptTag {
5200-
RAMBundle,
5201-
String,
5202-
}
5203-
52045196
enum facebook::react::TransformOperationType : uint8_t {
52055197
Arbitrary,
52065198
Identity,
@@ -5359,13 +5351,6 @@ struct facebook::react::Bridging<void> {
53595351
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53605352
}
53615353

5362-
struct facebook::react::BundleHeader {
5363-
public BundleHeader();
5364-
public facebook::react::Magic32 magic32;
5365-
public uint32_t version;
5366-
public uint64_t magic64;
5367-
}
5368-
53695354
struct facebook::react::Color {
53705355
public Color();
53715356
public Color(const facebook::react::ColorComponents& components);
@@ -5498,11 +5483,6 @@ struct facebook::react::LinearGradient {
54985483
public std::vector<facebook::react::ColorStop> colorStops;
54995484
}
55005485

5501-
struct facebook::react::Magic32 {
5502-
public uint32_t reserved_;
5503-
public uint32_t value;
5504-
}
5505-
55065486
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
55075487
public facebook::react::ModalHostViewSupportedOrientationsMask value;
55085488
}

‎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);
@@ -5181,11 +5178,6 @@ enum facebook::react::SchedulerPriority : int {
51815178
UserBlockingPriority,
51825179
}
51835180

5184-
enum facebook::react::ScriptTag {
5185-
RAMBundle,
5186-
String,
5187-
}
5188-
51895181
enum facebook::react::TransformOperationType : uint8_t {
51905182
Arbitrary,
51915183
Identity,
@@ -5344,13 +5336,6 @@ struct facebook::react::Bridging<void> {
53445336
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53455337
}
53465338

5347-
struct facebook::react::BundleHeader {
5348-
public BundleHeader();
5349-
public facebook::react::Magic32 magic32;
5350-
public uint32_t version;
5351-
public uint64_t magic64;
5352-
}
5353-
53545339
struct facebook::react::Color {
53555340
public Color();
53565341
public Color(const facebook::react::ColorComponents& components);
@@ -5483,11 +5468,6 @@ struct facebook::react::LinearGradient {
54835468
public std::vector<facebook::react::ColorStop> colorStops;
54845469
}
54855470

5486-
struct facebook::react::Magic32 {
5487-
public uint32_t reserved_;
5488-
public uint32_t value;
5489-
}
5490-
54915471
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
54925472
public facebook::react::ModalHostViewSupportedOrientationsMask value;
54935473
}

‎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);
@@ -5189,11 +5186,6 @@ enum facebook::react::SchedulerPriority : int {
51895186
UserBlockingPriority,
51905187
}
51915188

5192-
enum facebook::react::ScriptTag {
5193-
RAMBundle,
5194-
String,
5195-
}
5196-
51975189
enum facebook::react::TransformOperationType : uint8_t {
51985190
Arbitrary,
51995191
Identity,
@@ -5352,13 +5344,6 @@ struct facebook::react::Bridging<void> {
53525344
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53535345
}
53545346

5355-
struct facebook::react::BundleHeader {
5356-
public BundleHeader();
5357-
public facebook::react::Magic32 magic32;
5358-
public uint32_t version;
5359-
public uint64_t magic64;
5360-
}
5361-
53625347
struct facebook::react::Color {
53635348
public Color();
53645349
public Color(const facebook::react::ColorComponents& components);
@@ -5491,11 +5476,6 @@ struct facebook::react::LinearGradient {
54915476
public std::vector<facebook::react::ColorStop> colorStops;
54925477
}
54935478

5494-
struct facebook::react::Magic32 {
5495-
public uint32_t reserved_;
5496-
public uint32_t value;
5497-
}
5498-
54995479
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
55005480
public facebook::react::ModalHostViewSupportedOrientationsMask value;
55015481
}

0 commit comments

Comments
 (0)