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
255 lines
6.9 KiB
Objective-C
255 lines
6.9 KiB
Objective-C
/**
|
|
* 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 <Foundation/Foundation.h>
|
|
#import <XCTest/XCTest.h>
|
|
|
|
#import <RCTTest/RCTTestRunner.h>
|
|
#import <React/RCTBridge+Private.h>
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTBridgeModule.h>
|
|
#import <React/RCTJavaScriptExecutor.h>
|
|
#import <React/RCTUtils.h>
|
|
|
|
@interface RCTTestInjectedModule : NSObject <RCTBridgeModule>
|
|
@end
|
|
|
|
@implementation RCTTestInjectedModule
|
|
|
|
@synthesize bridge = _bridge;
|
|
@synthesize methodQueue = _methodQueue;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
@end
|
|
|
|
|
|
@interface RCTTestCustomInitModule : NSObject <RCTBridgeModule>
|
|
|
|
@property (nonatomic, assign) BOOL initializedOnMainQueue;
|
|
|
|
@end
|
|
|
|
@implementation RCTTestCustomInitModule
|
|
|
|
@synthesize bridge = _bridge;
|
|
@synthesize methodQueue = _methodQueue;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
- (id)init
|
|
{
|
|
if ((self = [super init])) {
|
|
_initializedOnMainQueue = RCTIsMainQueue();
|
|
}
|
|
return self;
|
|
}
|
|
|
|
@end
|
|
|
|
|
|
@interface RCTTestCustomSetBridgeModule : NSObject <RCTBridgeModule>
|
|
|
|
@property (nonatomic, assign) BOOL setBridgeOnMainQueue;
|
|
|
|
@end
|
|
|
|
@implementation RCTTestCustomSetBridgeModule
|
|
|
|
@synthesize bridge = _bridge;
|
|
@synthesize methodQueue = _methodQueue;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
- (void)setBridge:(RCTBridge *)bridge
|
|
{
|
|
_bridge = bridge;
|
|
_setBridgeOnMainQueue = RCTIsMainQueue();
|
|
}
|
|
|
|
@end
|
|
|
|
|
|
@interface RCTTestExportConstantsModule : NSObject <RCTBridgeModule>
|
|
|
|
@property (nonatomic, assign) BOOL exportedConstants;
|
|
@property (nonatomic, assign) BOOL exportedConstantsOnMainQueue;
|
|
|
|
@end
|
|
|
|
@implementation RCTTestExportConstantsModule
|
|
|
|
@synthesize bridge = _bridge;
|
|
@synthesize methodQueue = _methodQueue;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
- (NSDictionary<NSString *, id> *)constantsToExport
|
|
{
|
|
return [self getConstants];
|
|
}
|
|
|
|
- (NSDictionary<NSString *, id> *)getConstants
|
|
{
|
|
_exportedConstants = YES;
|
|
_exportedConstantsOnMainQueue = RCTIsMainQueue();
|
|
return @{ @"foo": @"bar" };
|
|
}
|
|
|
|
@end
|
|
|
|
|
|
@interface RCTLazyInitModule : NSObject <RCTBridgeModule>
|
|
@end
|
|
|
|
@implementation RCTLazyInitModule
|
|
|
|
@synthesize bridge = _bridge;
|
|
@synthesize methodQueue = _methodQueue;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
@end
|
|
|
|
|
|
@interface RCTModuleInitTests : XCTestCase <RCTBridgeDelegate>
|
|
{
|
|
RCTBridge *_bridge;
|
|
BOOL _injectedModuleInitNotificationSent;
|
|
BOOL _customInitModuleNotificationSent;
|
|
BOOL _customSetBridgeModuleNotificationSent;
|
|
BOOL _exportConstantsModuleNotificationSent;
|
|
BOOL _lazyInitModuleNotificationSent;
|
|
BOOL _lazyInitModuleNotificationSentOnMainQueue;
|
|
BOOL _viewManagerModuleNotificationSent;
|
|
RCTTestInjectedModule *_injectedModule;
|
|
}
|
|
@end
|
|
|
|
@implementation RCTModuleInitTests
|
|
|
|
- (NSURL *)sourceURLForBridge:(__unused RCTBridge *)bridge
|
|
{
|
|
NSBundle *bundle = [NSBundle bundleForClass:[self class]];
|
|
return [bundle URLForResource:@"RNTesterUnitTestsBundle" withExtension:@"js"];
|
|
}
|
|
|
|
- (NSArray *)extraModulesForBridge:(__unused RCTBridge *)bridge
|
|
{
|
|
return @[_injectedModule];
|
|
}
|
|
|
|
- (void)setUp
|
|
{
|
|
[super setUp];
|
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(moduleDidInit:) name:RCTDidInitializeModuleNotification object:nil];
|
|
|
|
_injectedModuleInitNotificationSent = NO;
|
|
_customInitModuleNotificationSent = NO;
|
|
_customSetBridgeModuleNotificationSent = NO;
|
|
_exportConstantsModuleNotificationSent = NO;
|
|
_lazyInitModuleNotificationSent = NO;
|
|
_viewManagerModuleNotificationSent = NO;
|
|
_injectedModule = [RCTTestInjectedModule new];
|
|
_bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:nil];
|
|
}
|
|
|
|
- (void)tearDown
|
|
{
|
|
[super tearDown];
|
|
|
|
[[NSNotificationCenter defaultCenter] removeObserver:self name:RCTDidInitializeModuleNotification object:nil];
|
|
|
|
[_bridge invalidate];
|
|
_bridge = nil;
|
|
}
|
|
|
|
- (void)moduleDidInit:(NSNotification *)note
|
|
{
|
|
id<RCTBridgeModule> module = note.userInfo[@"module"];
|
|
if ([module isKindOfClass:[RCTTestInjectedModule class]]) {
|
|
_injectedModuleInitNotificationSent = YES;
|
|
} else if ([module isKindOfClass:[RCTTestCustomInitModule class]]) {
|
|
_customInitModuleNotificationSent = YES;
|
|
} else if ([module isKindOfClass:[RCTTestCustomSetBridgeModule class]]) {
|
|
_customSetBridgeModuleNotificationSent = YES;
|
|
} else if ([module isKindOfClass:[RCTTestExportConstantsModule class]]) {
|
|
_exportConstantsModuleNotificationSent = YES;
|
|
} else if ([module isKindOfClass:[RCTLazyInitModule class]]) {
|
|
_lazyInitModuleNotificationSent = YES;
|
|
_lazyInitModuleNotificationSentOnMainQueue = RCTIsMainQueue();
|
|
}
|
|
}
|
|
|
|
- (void)testInjectedModulesInitializedDuringBridgeInit
|
|
{
|
|
XCTAssertEqual(_injectedModule, [_bridge moduleForClass:[RCTTestInjectedModule class]]);
|
|
XCTAssertEqual(_injectedModule.bridge, _bridge.batchedBridge);
|
|
XCTAssertNotNil(_injectedModule.methodQueue);
|
|
RCT_RUN_RUNLOOP_WHILE(!_injectedModuleInitNotificationSent);
|
|
XCTAssertTrue(_injectedModuleInitNotificationSent);
|
|
}
|
|
|
|
- (void)testCustomInitModuleInitializedAtBridgeStartup
|
|
{
|
|
RCT_RUN_RUNLOOP_WHILE(!_customInitModuleNotificationSent);
|
|
XCTAssertTrue(_customInitModuleNotificationSent);
|
|
RCTTestCustomInitModule *module = [_bridge moduleForClass:[RCTTestCustomInitModule class]];
|
|
XCTAssertTrue(module.initializedOnMainQueue);
|
|
XCTAssertEqual(module.bridge, _bridge.batchedBridge);
|
|
XCTAssertNotNil(module.methodQueue);
|
|
}
|
|
|
|
- (void)testCustomSetBridgeModuleInitializedAtBridgeStartup
|
|
{
|
|
XCTAssertFalse(_customSetBridgeModuleNotificationSent);
|
|
|
|
__block RCTTestCustomSetBridgeModule *module;
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
module = [self->_bridge moduleForClass:[RCTTestCustomSetBridgeModule class]];
|
|
});
|
|
|
|
RCT_RUN_RUNLOOP_WHILE(!module);
|
|
XCTAssertTrue(_customSetBridgeModuleNotificationSent);
|
|
XCTAssertFalse(module.setBridgeOnMainQueue);
|
|
XCTAssertEqual(module.bridge, _bridge.batchedBridge);
|
|
XCTAssertNotNil(module.methodQueue);
|
|
}
|
|
|
|
- (void)testExportConstantsModuleInitializedAtBridgeStartup
|
|
{
|
|
RCT_RUN_RUNLOOP_WHILE(!_exportConstantsModuleNotificationSent);
|
|
XCTAssertTrue(_exportConstantsModuleNotificationSent);
|
|
RCTTestExportConstantsModule *module = [_bridge moduleForClass:[RCTTestExportConstantsModule class]];
|
|
RCT_RUN_RUNLOOP_WHILE(!module.exportedConstants);
|
|
XCTAssertTrue(module.exportedConstants);
|
|
XCTAssertTrue(module.exportedConstantsOnMainQueue);
|
|
XCTAssertEqual(module.bridge, _bridge.batchedBridge);
|
|
XCTAssertNotNil(module.methodQueue);
|
|
}
|
|
|
|
- (void)testLazyInitModuleNotInitializedDuringBridgeInit
|
|
{
|
|
XCTAssertFalse(_lazyInitModuleNotificationSent);
|
|
|
|
__block RCTLazyInitModule *module;
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
module = [self->_bridge moduleForClass:[RCTLazyInitModule class]];
|
|
});
|
|
|
|
RCT_RUN_RUNLOOP_WHILE(!module);
|
|
XCTAssertTrue(_lazyInitModuleNotificationSent);
|
|
XCTAssertFalse(_lazyInitModuleNotificationSentOnMainQueue);
|
|
XCTAssertNotNil(module);
|
|
XCTAssertEqual(module.bridge, _bridge.batchedBridge);
|
|
XCTAssertNotNil(module.methodQueue);
|
|
}
|
|
|
|
@end
|