Skip to content

Gate Metro connectivity on RCT_DEV_MENU instead of RCT_DEV #57080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fmacinator wants to merge 1 commit into from
Closed

Gate Metro connectivity on RCT_DEV_MENU instead of RCT_DEV #57080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions packages/react-native/React/Base/RCTBundleURLProvider.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

const NSUInteger kRCTBundleURLProviderDefaultPort = RCT_METRO_PORT;

#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
static BOOL kRCTAllowPackagerAccess = YES;
void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
{
Expand Down Expand Up @@ -81,7 +81,7 @@ - (void)resetToDefaults
(unsigned long)kRCTBundleURLProviderDefaultPort]];
}

#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+ (BOOL)isPackagerRunning:(NSString *)hostPort
{
return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];
Expand Down Expand Up @@ -258,14 +258,14 @@ - (NSString *)packagerServerHost

- (NSString *)packagerServerHostPort
{
#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
if (!kRCTAllowPackagerAccess) {
RCTLogInfo(@"Packager server access is disabled in this environment");
return nil;
}
#endif
NSString *location = [self jsLocation];
#if RCT_DEV
#if RCT_DEV_MENU
NSString *scheme = [self packagerScheme];
if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location scheme:scheme]) {
location = nil;
Expand Down
Loading