mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
3724810d21
Summary: This PR adds initial support for Project Catalyst a.k.a. UIKitForMac. This is not yet meant for production, but this is enough for RNTester to successfully compile and mostly work :) Some APIs are not supported on the Mac -- e.g. telephony, and deprecated APIs are removed on Mac ���-- those had to be ifdef'd out via platform checks. The biggest limitation right now is that I couldn't get Web Socket code to successfully compile, and so there are a lot of temporary platform checks for that , and the RCTWebSocket.xcodeproj is marked as not supporting UIKitForMac. Again -- temporary, until someone with more knowledge knows how to fix this. https://github.com/react-native-community/discussions-and-proposals/issues/131 ## Changelog [iOS] [Added] - Fixed compilation for macOS (Project Catalyst) -- not meant for production use yet Pull Request resolved: https://github.com/facebook/react-native/pull/25427 Test Plan: - Open RNTester/RNTester.xcodeproj with Xcode 10.2, run it like a normal iOS app -- make sure it compiles and runs correctly (no regression) - Open the same project with Xcode 11 beta 2 (or higher) on macOS Catalina beta, select "My Mac" as device target, and run -- see that it actually compiles and runs. **Note** there are unfortunately some required steps: - change build configuration to Release (because packager doesn't work correctly yet) - change development team to yours if Xcode tells you to - go to RNTester project → Build phases → Link binary with libraries, and change `platforms` for `libRCTWebSocket.a` to `iOS` (without Mac compatibility). I can't commit that change because it breaks compatibility with earlier Xcode versions The two extra steps for successful compile will disappear once web socket compilation for Catalyst is fixed Reviewed By: mmmulani Differential Revision: D16088263 Pulled By: sammy-SC fbshipit-source-id: 9c0b932b048e50a8e0f336eaa0612851b1909cae
142 lines
5.6 KiB
Plaintext
142 lines
5.6 KiB
Plaintext
// Copyright (c) Facebook, Inc. and its affiliates.
|
|
//
|
|
// This source code is licensed under the MIT license found in the
|
|
// LICENSE file in the root directory of this source tree.
|
|
|
|
#import "RCTInspectorDevServerHelper.h"
|
|
|
|
#if RCT_DEV && !TARGET_OS_UIKITFORMAC
|
|
|
|
#import <UIKit/UIKit.h>
|
|
#import <React/RCTLog.h>
|
|
|
|
#import "RCTDefines.h"
|
|
#import "RCTInspectorPackagerConnection.h"
|
|
|
|
static NSString *const kDebuggerMsgDisable = @"{ \"id\":1,\"method\":\"Debugger.disable\" }";
|
|
|
|
static NSString *getServerHost(NSURL *bundleURL, NSNumber *port)
|
|
{
|
|
NSString *host = [bundleURL host];
|
|
if (!host) {
|
|
host = @"localhost";
|
|
}
|
|
|
|
// this is consistent with the Android implementation, where http:// is the
|
|
// hardcoded implicit scheme for the debug server. Note, packagerURL
|
|
// technically looks like it could handle schemes/protocols other than HTTP,
|
|
// so rather than force HTTP, leave it be for now, in case someone is relying
|
|
// on that ability when developing against iOS.
|
|
return [NSString stringWithFormat:@"%@:%@", host, port];
|
|
}
|
|
|
|
static NSURL *getInspectorDeviceUrl(NSURL *bundleURL)
|
|
{
|
|
NSNumber *inspectorProxyPort = @8081;
|
|
NSString *inspectorProxyPortStr = [[[NSProcessInfo processInfo] environment] objectForKey:@"RCT_METRO_PORT"];
|
|
if (inspectorProxyPortStr && [inspectorProxyPortStr length] > 0) {
|
|
inspectorProxyPort = [NSNumber numberWithInt:[inspectorProxyPortStr intValue]];
|
|
}
|
|
NSString *escapedDeviceName = [[[UIDevice currentDevice] name] stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
|
|
NSString *escapedAppName = [[[NSBundle mainBundle] bundleIdentifier] stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
|
|
return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/inspector/device?name=%@&app=%@",
|
|
getServerHost(bundleURL, inspectorProxyPort),
|
|
escapedDeviceName,
|
|
escapedAppName]];
|
|
}
|
|
|
|
static NSURL *getAttachDeviceUrl(NSURL *bundleURL, NSString *title)
|
|
{
|
|
NSNumber *metroBundlerPort = @8081;
|
|
NSString *metroBundlerPortStr = [[[NSProcessInfo processInfo] environment] objectForKey:@"RCT_METRO_PORT"];
|
|
if (metroBundlerPortStr && [metroBundlerPortStr length] > 0) {
|
|
metroBundlerPort = [NSNumber numberWithInt:[metroBundlerPortStr intValue]];
|
|
}
|
|
NSString *escapedDeviceName = [[[UIDevice currentDevice] name] stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLHostAllowedCharacterSet];
|
|
NSString *escapedAppName = [[[NSBundle mainBundle] bundleIdentifier] stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLHostAllowedCharacterSet];
|
|
return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/attach-debugger-nuclide?title=%@&device=%@&app=%@",
|
|
getServerHost(bundleURL, metroBundlerPort),
|
|
title,
|
|
escapedDeviceName,
|
|
escapedAppName]];
|
|
}
|
|
|
|
@implementation RCTInspectorDevServerHelper
|
|
|
|
RCT_NOT_IMPLEMENTED(- (instancetype)init)
|
|
|
|
static NSMutableDictionary<NSString *, RCTInspectorPackagerConnection *> *socketConnections = nil;
|
|
|
|
static void sendEventToAllConnections(NSString *event)
|
|
{
|
|
for (NSString *socketId in socketConnections) {
|
|
[socketConnections[socketId] sendEventToAllConnections:event];
|
|
}
|
|
}
|
|
|
|
static void displayErrorAlert(UIViewController *view, NSString *message) {
|
|
UIAlertController *alert =
|
|
[UIAlertController alertControllerWithTitle:nil
|
|
message:message
|
|
preferredStyle:UIAlertControllerStyleAlert];
|
|
[view presentViewController:alert animated:YES completion:nil];
|
|
dispatch_after(
|
|
dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC * 2.5),
|
|
dispatch_get_main_queue(),
|
|
^{
|
|
[alert dismissViewControllerAnimated:YES completion:nil];
|
|
});
|
|
}
|
|
|
|
+ (void)attachDebugger:(NSString *)owner
|
|
withBundleURL:(NSURL *)bundleURL
|
|
withView:(UIViewController *)view
|
|
{
|
|
NSURL *url = getAttachDeviceUrl(bundleURL, owner);
|
|
|
|
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
|
|
[request setHTTPMethod:@"GET"];
|
|
|
|
__weak UIViewController *viewCapture = view;
|
|
[[[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:
|
|
^(__unused NSData *_Nullable data,
|
|
__unused NSURLResponse *_Nullable response,
|
|
NSError *_Nullable error) {
|
|
UIViewController *viewCaptureStrong = viewCapture;
|
|
if (error != nullptr && viewCaptureStrong != nullptr) {
|
|
displayErrorAlert(viewCaptureStrong, @"The request to attach Nuclide couldn't reach Metro Bundler!");
|
|
}
|
|
}] resume];
|
|
}
|
|
|
|
+ (void)disableDebugger
|
|
{
|
|
sendEventToAllConnections(kDebuggerMsgDisable);
|
|
}
|
|
|
|
+ (RCTInspectorPackagerConnection *)connectWithBundleURL:(NSURL *)bundleURL
|
|
{
|
|
NSURL *inspectorURL = getInspectorDeviceUrl(bundleURL);
|
|
|
|
// Note, using a static dictionary isn't really the greatest design, but
|
|
// the packager connection does the same thing, so it's at least consistent.
|
|
// This is a static map that holds different inspector clients per the inspectorURL
|
|
if (socketConnections == nil) {
|
|
socketConnections = [NSMutableDictionary new];
|
|
}
|
|
|
|
NSString *key = [inspectorURL absoluteString];
|
|
RCTInspectorPackagerConnection *connection = socketConnections[key];
|
|
if (!connection) {
|
|
connection = [[RCTInspectorPackagerConnection alloc] initWithURL:inspectorURL];
|
|
socketConnections[key] = connection;
|
|
[connection connect];
|
|
}
|
|
|
|
return connection;
|
|
}
|
|
|
|
@end
|
|
|
|
#endif
|