mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
8131b7bb7b
Summary: This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in https://github.com/facebook/react-native/pull/25393#issuecomment-508457700. If accepted, it will fix https://github.com/facebook/react-native/issues/25349. It builds on the changes I made in https://github.com/facebook/react-native/pull/25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`. The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` . There are still a few breaking changes which I hope will be acceptable: - `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path. - ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511040967. - ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled. Still to do: - ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in https://github.com/facebook/react-native/issues/25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by https://github.com/facebook/react-native/pull/25619/commits/33573511f02f3502a28bad48e085e9a4b8608302. - I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? � ## Changelog [iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks. Pull Request resolved: https://github.com/facebook/react-native/pull/25619 Test Plan: ### FB ``` buck build catalyst ``` ### Sample Project Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed. You can see that it works with these steps: 1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git` 2. `git checkout fix-frameworks-subspecs` 3. `cd ios && pod install` 4. `cd .. && react-native run-ios` The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again. ### RNTesterPods `RNTesterPodsPods` can now work with or without `use_frameworks!`. 1. Go to the `RNTester` directory and run `pod install`. 2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine. 3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again. 4. Run the tests again and see that it still works with frameworks enabled. Reviewed By: PeteTheHeat Differential Revision: D16465247 Pulled By: PeteTheHeat fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
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 <React/RCTInspectorDevServerHelper.h>
|
|
|
|
#if RCT_DEV && !TARGET_OS_UIKITFORMAC
|
|
|
|
#import <UIKit/UIKit.h>
|
|
#import <React/RCTLog.h>
|
|
|
|
#import <React/RCTDefines.h>
|
|
#import <React/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
|