Skip to content

Commit c32e40f

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] Differential Revision: D124104985
1 parent 31632fa commit c32e40f

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);
@@ -3013,11 +3010,6 @@ enum facebook::react::SchedulerPriority : int {
30133010
UserBlockingPriority,
30143011
}
30153012

3016-
enum facebook::react::ScriptTag {
3017-
RAMBundle,
3018-
String,
3019-
}
3020-
30213013
enum facebook::react::TransformOperationType : uint8_t {
30223014
Arbitrary,
30233015
Identity,
@@ -3179,13 +3171,6 @@ struct facebook::react::Bridging<void> {
31793171
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31803172
}
31813173

3182-
struct facebook::react::BundleHeader {
3183-
public BundleHeader();
3184-
public facebook::react::Magic32 magic32;
3185-
public uint32_t version;
3186-
public uint64_t magic64;
3187-
}
3188-
31893174
struct facebook::react::Color {
31903175
public bool isDefined;
31913176
public constexpr Color() = default;
@@ -3414,11 +3399,6 @@ struct facebook::react::LinearGradient {
34143399
public std::vector<facebook::react::ColorStop> colorStops;
34153400
}
34163401

3417-
struct facebook::react::Magic32 {
3418-
public uint32_t reserved_;
3419-
public uint32_t value;
3420-
}
3421-
34223402
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
34233403
public facebook::react::ModalHostViewSupportedOrientationsMask value;
34243404
}

‎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);
@@ -3006,11 +3003,6 @@ enum facebook::react::SchedulerPriority : int {
30063003
UserBlockingPriority,
30073004
}
30083005

3009-
enum facebook::react::ScriptTag {
3010-
RAMBundle,
3011-
String,
3012-
}
3013-
30143006
enum facebook::react::TransformOperationType : uint8_t {
30153007
Arbitrary,
30163008
Identity,
@@ -3172,13 +3164,6 @@ struct facebook::react::Bridging<void> {
31723164
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31733165
}
31743166

3175-
struct facebook::react::BundleHeader {
3176-
public BundleHeader();
3177-
public facebook::react::Magic32 magic32;
3178-
public uint32_t version;
3179-
public uint64_t magic64;
3180-
}
3181-
31823167
struct facebook::react::Color {
31833168
public bool isDefined;
31843169
public constexpr Color() = default;
@@ -3407,11 +3392,6 @@ struct facebook::react::LinearGradient {
34073392
public std::vector<facebook::react::ColorStop> colorStops;
34083393
}
34093394

3410-
struct facebook::react::Magic32 {
3411-
public uint32_t reserved_;
3412-
public uint32_t value;
3413-
}
3414-
34153395
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
34163396
public facebook::react::ModalHostViewSupportedOrientationsMask value;
34173397
}

‎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);
@@ -3006,11 +3003,6 @@ enum facebook::react::SchedulerPriority : int {
30063003
UserBlockingPriority,
30073004
}
30083005

3009-
enum facebook::react::ScriptTag {
3010-
RAMBundle,
3011-
String,
3012-
}
3013-
30143006
enum facebook::react::TransformOperationType : uint8_t {
30153007
Arbitrary,
30163008
Identity,
@@ -3172,13 +3164,6 @@ struct facebook::react::Bridging<void> {
31723164
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
31733165
}
31743166

3175-
struct facebook::react::BundleHeader {
3176-
public BundleHeader();
3177-
public facebook::react::Magic32 magic32;
3178-
public uint32_t version;
3179-
public uint64_t magic64;
3180-
}
3181-
31823167
struct facebook::react::Color {
31833168
public bool isDefined;
31843169
public constexpr Color() = default;
@@ -3407,11 +3392,6 @@ struct facebook::react::LinearGradient {
34073392
public std::vector<facebook::react::ColorStop> colorStops;
34083393
}
34093394

3410-
struct facebook::react::Magic32 {
3411-
public uint32_t reserved_;
3412-
public uint32_t value;
3413-
}
3414-
34153395
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
34163396
public facebook::react::ModalHostViewSupportedOrientationsMask value;
34173397
}

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3283,9 +3283,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
32833283
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
32843284
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
32853285
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
3286-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
32873286
bool facebook::react::isZero(facebook::react::Float n);
3288-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
32893287
constexpr auto facebook::react::to_underlying(auto e) noexcept;
32903288
constexpr char facebook::react::toLower(char c);
32913289
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -3301,7 +3299,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
33013299
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
33023300
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
33033301
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
3304-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
33053302
facebook::react::SharedColor facebook::react::blackColor();
33063303
facebook::react::SharedColor facebook::react::clearColor();
33073304
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -5208,11 +5205,6 @@ enum facebook::react::SchedulerPriority : int {
52085205
UserBlockingPriority,
52095206
}
52105207

5211-
enum facebook::react::ScriptTag {
5212-
RAMBundle,
5213-
String,
5214-
}
5215-
52165208
enum facebook::react::TransformOperationType : uint8_t {
52175209
Arbitrary,
52185210
Identity,
@@ -5371,13 +5363,6 @@ struct facebook::react::Bridging<void> {
53715363
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53725364
}
53735365

5374-
struct facebook::react::BundleHeader {
5375-
public BundleHeader();
5376-
public facebook::react::Magic32 magic32;
5377-
public uint32_t version;
5378-
public uint64_t magic64;
5379-
}
5380-
53815366
struct facebook::react::Color {
53825367
public Color();
53835368
public Color(const facebook::react::ColorComponents& components);
@@ -5510,11 +5495,6 @@ struct facebook::react::LinearGradient {
55105495
public std::vector<facebook::react::ColorStop> colorStops;
55115496
}
55125497

5513-
struct facebook::react::Magic32 {
5514-
public uint32_t reserved_;
5515-
public uint32_t value;
5516-
}
5517-
55185498
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
55195499
public facebook::react::ModalHostViewSupportedOrientationsMask value;
55205500
}

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3275,9 +3275,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
32753275
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
32763276
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
32773277
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
3278-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
32793278
bool facebook::react::isZero(facebook::react::Float n);
3280-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
32813279
constexpr auto facebook::react::to_underlying(auto e) noexcept;
32823280
constexpr char facebook::react::toLower(char c);
32833281
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -3293,7 +3291,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
32933291
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
32943292
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
32953293
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
3296-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
32973294
facebook::react::SharedColor facebook::react::blackColor();
32983295
facebook::react::SharedColor facebook::react::clearColor();
32993296
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -5193,11 +5190,6 @@ enum facebook::react::SchedulerPriority : int {
51935190
UserBlockingPriority,
51945191
}
51955192

5196-
enum facebook::react::ScriptTag {
5197-
RAMBundle,
5198-
String,
5199-
}
5200-
52015193
enum facebook::react::TransformOperationType : uint8_t {
52025194
Arbitrary,
52035195
Identity,
@@ -5356,13 +5348,6 @@ struct facebook::react::Bridging<void> {
53565348
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53575349
}
53585350

5359-
struct facebook::react::BundleHeader {
5360-
public BundleHeader();
5361-
public facebook::react::Magic32 magic32;
5362-
public uint32_t version;
5363-
public uint64_t magic64;
5364-
}
5365-
53665351
struct facebook::react::Color {
53675352
public Color();
53685353
public Color(const facebook::react::ColorComponents& components);
@@ -5495,11 +5480,6 @@ struct facebook::react::LinearGradient {
54955480
public std::vector<facebook::react::ColorStop> colorStops;
54965481
}
54975482

5498-
struct facebook::react::Magic32 {
5499-
public uint32_t reserved_;
5500-
public uint32_t value;
5501-
}
5502-
55035483
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
55045484
public facebook::react::ModalHostViewSupportedOrientationsMask value;
55055485
}

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3283,9 +3283,7 @@ YGDirection facebook::react::yogaDirectionFromLayoutDirection(facebook::react::L
32833283
bool facebook::react::areBorderRadiiCircular(const facebook::react::BorderRadii& borderRadii);
32843284
bool facebook::react::hostPlatformColorIsColorMeaningful(facebook::react::Color color) noexcept;
32853285
bool facebook::react::isColorMeaningful(const facebook::react::SharedColor& color) noexcept;
3286-
bool facebook::react::isHermesBytecodeBundle(const facebook::react::BundleHeader& header);
32873286
bool facebook::react::isZero(facebook::react::Float n);
3288-
const char* facebook::react::stringForScriptTag(const facebook::react::ScriptTag& tag);
32893287
constexpr auto facebook::react::to_underlying(auto e) noexcept;
32903288
constexpr char facebook::react::toLower(char c);
32913289
constexpr uint32_t facebook::react::fnv1aLowercase(std::string_view string);
@@ -3301,7 +3299,6 @@ facebook::react::Float facebook::react::floatFromYogaOptionalFloat(facebook::yog
33013299
facebook::react::LayoutMetrics facebook::react::layoutMetricsFromYogaNode(facebook::yoga::Node& yogaNode);
33023300
facebook::react::Rect facebook::react::insetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& insets) noexcept;
33033301
facebook::react::Rect facebook::react::outsetBy(const facebook::react::Rect& rect, const facebook::react::EdgeInsets& outsets) noexcept;
3304-
facebook::react::ScriptTag facebook::react::parseTypeFromHeader(const facebook::react::BundleHeader& header);
33053302
facebook::react::SharedColor facebook::react::blackColor();
33063303
facebook::react::SharedColor facebook::react::clearColor();
33073304
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
@@ -5201,11 +5198,6 @@ enum facebook::react::SchedulerPriority : int {
52015198
UserBlockingPriority,
52025199
}
52035200

5204-
enum facebook::react::ScriptTag {
5205-
RAMBundle,
5206-
String,
5207-
}
5208-
52095201
enum facebook::react::TransformOperationType : uint8_t {
52105202
Arbitrary,
52115203
Identity,
@@ -5364,13 +5356,6 @@ struct facebook::react::Bridging<void> {
53645356
public static void fromJs(facebook::jsi::Runtime&, const facebook::jsi::Value&);
53655357
}
53665358

5367-
struct facebook::react::BundleHeader {
5368-
public BundleHeader();
5369-
public facebook::react::Magic32 magic32;
5370-
public uint32_t version;
5371-
public uint64_t magic64;
5372-
}
5373-
53745359
struct facebook::react::Color {
53755360
public Color();
53765361
public Color(const facebook::react::ColorComponents& components);
@@ -5503,11 +5488,6 @@ struct facebook::react::LinearGradient {
55035488
public std::vector<facebook::react::ColorStop> colorStops;
55045489
}
55055490

5506-
struct facebook::react::Magic32 {
5507-
public uint32_t reserved_;
5508-
public uint32_t value;
5509-
}
5510-
55115491
struct facebook::react::ModalHostViewSupportedOrientationsMaskWrapped {
55125492
public facebook::react::ModalHostViewSupportedOrientationsMask value;
55135493
}

0 commit comments

Comments
 (0)