From db8efd9c4bbacb24fe40200383512535dd16f8e8 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Thu, 20 Apr 2017 08:20:03 -0700 Subject: [PATCH] Split off websocket related items to RCTPackagerConnection Reviewed By: cwdick Differential Revision: D4588557 fbshipit-source-id: 3f4176b9bab2b06cacbb06f1ff514a5f99a76d73 --- React.podspec | 4 +- .../RCTDevLoadingView.h | 2 + .../RCTDevLoadingView.m | 5 +- React/{Modules => DevSupport}/RCTDevMenu.h | 0 React/{Modules => DevSupport}/RCTDevMenu.m | 0 React/DevSupport/RCTPackagerConnection.h | 28 ++++ React/DevSupport/RCTPackagerConnection.m | 87 +++++++++++++ React/DevSupport/RCTReloadPackagerMethod.h | 5 +- React/DevSupport/RCTReloadPackagerMethod.m | 2 + .../RCTSamplingProfilerPackagerMethod.mm | 1 + React/Modules/RCTDevSettings.mm | 89 ++++--------- React/React.xcodeproj/project.pbxproj | 44 ++++--- React/ReactCxx.xcodeproj/project.pbxproj | 120 ++++++++++++++++-- 13 files changed, 287 insertions(+), 100 deletions(-) rename React/{Modules => DevSupport}/RCTDevLoadingView.h (94%) rename React/{Modules => DevSupport}/RCTDevLoadingView.m (99%) rename React/{Modules => DevSupport}/RCTDevMenu.h (100%) rename React/{Modules => DevSupport}/RCTDevMenu.m (100%) create mode 100644 React/DevSupport/RCTPackagerConnection.h create mode 100644 React/DevSupport/RCTPackagerConnection.m diff --git a/React.podspec b/React.podspec index dcc10543f..71384be54 100644 --- a/React.podspec +++ b/React.podspec @@ -43,7 +43,7 @@ Pod::Spec.new do |s| ss.dependency "Yoga", "#{package["version"]}.React" ss.dependency "React/cxxreact" ss.source_files = "React/**/*.{c,h,m,mm,S}" - ss.exclude_files = "**/__tests__/*", "IntegrationTests/*", "React/DevSupport/*", "React/Modules/RCTDev{LoadingView,Menu}.*", "React/**/RCTTVView.*", "ReactCommon/yoga/*", "React/Cxx*/*" + ss.exclude_files = "**/__tests__/*", "IntegrationTests/*", "React/DevSupport/*", "React/**/RCTTVView.*", "ReactCommon/yoga/*", "React/Cxx*/*" ss.framework = "JavaScriptCore" ss.libraries = "stdc++" end @@ -51,7 +51,7 @@ Pod::Spec.new do |s| s.subspec "DevSupport" do |ss| ss.dependency "React/Core" ss.dependency "React/RCTWebSocket" - ss.source_files = "React/DevSupport/*", "React/Modules/RCTDev{LoadingView,Menu}.*" + ss.source_files = "React/DevSupport/*" end s.subspec "tvOS" do |ss| diff --git a/React/Modules/RCTDevLoadingView.h b/React/DevSupport/RCTDevLoadingView.h similarity index 94% rename from React/Modules/RCTDevLoadingView.h rename to React/DevSupport/RCTDevLoadingView.h index 16e8ae4c3..caf6f2525 100644 --- a/React/Modules/RCTDevLoadingView.h +++ b/React/DevSupport/RCTDevLoadingView.h @@ -9,6 +9,8 @@ #import +@class RCTLoadingProgress; + @interface RCTDevLoadingView : NSObject + (void)setEnabled:(BOOL)enabled; diff --git a/React/Modules/RCTDevLoadingView.m b/React/DevSupport/RCTDevLoadingView.m similarity index 99% rename from React/Modules/RCTDevLoadingView.m rename to React/DevSupport/RCTDevLoadingView.m index 89f645ff8..bb27e0504 100644 --- a/React/Modules/RCTDevLoadingView.m +++ b/React/DevSupport/RCTDevLoadingView.m @@ -7,13 +7,14 @@ * of patent rights can be found in the PATENTS file in the same directory. */ +#import "RCTDevLoadingView.h" + #import #import "RCTBridge.h" -#import "RCTDevLoadingView.h" #import "RCTDefines.h" -#import "RCTUtils.h" #import "RCTModalHostViewController.h" +#import "RCTUtils.h" #if RCT_DEV diff --git a/React/Modules/RCTDevMenu.h b/React/DevSupport/RCTDevMenu.h similarity index 100% rename from React/Modules/RCTDevMenu.h rename to React/DevSupport/RCTDevMenu.h diff --git a/React/Modules/RCTDevMenu.m b/React/DevSupport/RCTDevMenu.m similarity index 100% rename from React/Modules/RCTDevMenu.m rename to React/DevSupport/RCTDevMenu.m diff --git a/React/DevSupport/RCTPackagerConnection.h b/React/DevSupport/RCTPackagerConnection.h new file mode 100644 index 000000000..d93dbfd0f --- /dev/null +++ b/React/DevSupport/RCTPackagerConnection.h @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + */ + +#import + +#import + +#if RCT_DEV + +@class RCTBridge; + +/** + * Encapsulates connection to React Native packager + */ +@interface RCTPackagerConnection : NSObject + +- (instancetype)initWithBridge:(RCTBridge *)bridge; +- (void)connect; + +@end + +#endif diff --git a/React/DevSupport/RCTPackagerConnection.m b/React/DevSupport/RCTPackagerConnection.m new file mode 100644 index 000000000..a063bb3c1 --- /dev/null +++ b/React/DevSupport/RCTPackagerConnection.m @@ -0,0 +1,87 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + */ + +#import "RCTPackagerConnection.h" + +#import + +#import +#import +#import + +#import "RCTPackagerClient.h" +#import "RCTReloadPackagerMethod.h" +#import "RCTSamplingProfilerPackagerMethod.h" + +#if RCT_DEV + +@implementation RCTPackagerConnection { + RCTBridge *_bridge; +} + +- (instancetype)initWithBridge:(RCTBridge *)bridge +{ + if (self = [super init]) { + _bridge = bridge; + } + return self; +} + +- (void)connect +{ + RCTAssertMainQueue(); + + NSURL *url = [self packagerURL]; + if (!url) { + return; + } + + // The jsPackagerClient is a static map that holds different packager clients per the packagerURL + // In case many instances of DevMenu are created, the latest instance that use the same URL as + // previous instances will override given packager client's method handlers + static NSMutableDictionary *jsPackagerClients = nil; + if (jsPackagerClients == nil) { + jsPackagerClients = [NSMutableDictionary new]; + } + + NSString *key = [url absoluteString]; + RCTPackagerClient *packagerClient = jsPackagerClients[key]; + if (!packagerClient) { + packagerClient = [[RCTPackagerClient alloc] initWithURL:url]; + jsPackagerClients[key] = packagerClient; + } else { + [packagerClient stop]; + } + + [packagerClient addHandler:[[RCTReloadPackagerMethod alloc] initWithBridge:_bridge] + forMethod:@"reload"]; + [packagerClient addHandler:[[RCTSamplingProfilerPackagerMethod alloc] initWithBridge:_bridge] + forMethod:@"pokeSamplingProfiler"]; + [packagerClient start]; +} + +- (NSURL *)packagerURL +{ + NSString *host = [_bridge.bundleURL host]; + NSString *scheme = [_bridge.bundleURL scheme]; + if (!host) { + host = @"localhost"; + scheme = @"http"; + } + + NSNumber *port = [_bridge.bundleURL port]; + if (!port) { + port = @8081; // Packager default port + } + return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@:%@/message?role=ios-rn-rctdevmenu", scheme, host, port]]; +} + +@end + +#endif diff --git a/React/DevSupport/RCTReloadPackagerMethod.h b/React/DevSupport/RCTReloadPackagerMethod.h index a357f808a..6441cbf27 100644 --- a/React/DevSupport/RCTReloadPackagerMethod.h +++ b/React/DevSupport/RCTReloadPackagerMethod.h @@ -7,12 +7,13 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import #import #if RCT_DEV // Only supported in dev mode -@interface RCTReloadPackagerMethod : NSObject +@class RCTBridge; + +@interface RCTReloadPackagerMethod : NSObject - (instancetype)initWithBridge:(RCTBridge *)bridge; diff --git a/React/DevSupport/RCTReloadPackagerMethod.m b/React/DevSupport/RCTReloadPackagerMethod.m index f651b316d..1135d0c79 100644 --- a/React/DevSupport/RCTReloadPackagerMethod.m +++ b/React/DevSupport/RCTReloadPackagerMethod.m @@ -11,6 +11,8 @@ #import +#import "RCTBridge.h" + #if RCT_DEV // Only supported in dev mode @implementation RCTReloadPackagerMethod { diff --git a/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm b/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm index c7adaf27e..89dcee5bb 100644 --- a/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm +++ b/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm @@ -14,6 +14,7 @@ #import #import +#import "RCTBridge.h" #import "RCTLog.h" #if RCT_DEV // Only supported in dev mode diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm index 3c91730c3..51ddba526 100644 --- a/React/Modules/RCTDevSettings.mm +++ b/React/Modules/RCTDevSettings.mm @@ -37,13 +37,14 @@ NSString *const kRCTDevSettingStartSamplingProfilerOnLaunch = @"startSamplingPro NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu"; -#if RCT_DEV -#if __has_include("RCTPackagerClient.h") -#import "RCTPackagerClient.h" -#import "RCTReloadPackagerMethod.h" -#import "RCTSamplingProfilerPackagerMethod.h" +#define ENABLE_PACKAGER_CONNECTION RCT_DEV && __has_include("RCTPackagerConnection.h") + +#if ENABLE_PACKAGER_CONNECTION +#import "RCTPackagerConnection.h" #endif +#if RCT_DEV + @interface RCTDevSettingsUserDefaultsDataSource : NSObject @end @@ -109,6 +110,10 @@ NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu"; NSURLSessionDataTask *_liveReloadUpdateTask; NSURL *_liveReloadURL; BOOL _isJSLoaded; + +#if ENABLE_PACKAGER_CONNECTION + RCTPackagerConnection *_packagerConnection; +#endif } @property (nonatomic, strong) Class executorClass; @@ -144,7 +149,7 @@ RCT_EXPORT_MODULE() // Delay setup until after Bridge init dispatch_async(dispatch_get_main_queue(), ^{ [self _synchronizeAllSettings]; - [self connectPackager]; + [self _configurePackagerConnection]; }); } return self; @@ -380,7 +385,19 @@ RCT_EXPORT_METHOD(toggleElementInspector) } } -#pragma mark - internal +#pragma mark - Internal + +- (void)_configurePackagerConnection +{ +#if ENABLE_PACKAGER_CONNECTION + if (_packagerConnection) { + return; + } + + _packagerConnection = [[RCTPackagerConnection alloc] initWithBridge:_bridge]; + [_packagerConnection connect]; +#endif +} /** * Query the data source for all possible settings and make sure we're doing the right @@ -459,64 +476,6 @@ RCT_EXPORT_METHOD(toggleElementInspector) }); } -#pragma mark - RCTWebSocketObserver - -- (NSURL *)packagerURL -{ -#if !__has_include("RCTWebSocketObserver.h") - return nil; -#else - NSString *host = [_bridge.bundleURL host]; - NSString *scheme = [_bridge.bundleURL scheme]; - if (!host) { - host = @"localhost"; - scheme = @"http"; - } - - NSNumber *port = [_bridge.bundleURL port]; - if (!port) { - port = @8081; // Packager default port - } - return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@:%@/message?role=ios-rn-rctdevmenu", scheme, host, port]]; -#endif -} - -// TODO: Move non-UI logic into separate RCTDevSettings module -- (void)connectPackager -{ - RCTAssertMainQueue(); - - NSURL *url = [self packagerURL]; - if (!url) { - return; - } - -#if __has_include("RCTPackagerClient.h") - // The jsPackagerClient is a static map that holds different packager clients per the packagerURL - // In case many instances of DevMenu are created, the latest instance that use the same URL as - // previous instances will override given packager client's method handlers - static NSMutableDictionary *jsPackagerClients = nil; - if (jsPackagerClients == nil) { - jsPackagerClients = [NSMutableDictionary new]; - } - - NSString *key = [url absoluteString]; - RCTPackagerClient *packagerClient = jsPackagerClients[key]; - if (!packagerClient) { - packagerClient = [[RCTPackagerClient alloc] initWithURL:url]; - jsPackagerClients[key] = packagerClient; - } else { - [packagerClient stop]; - } - - [packagerClient addHandler:[[RCTReloadPackagerMethod alloc] initWithBridge:_bridge] - forMethod:@"reload"]; - [packagerClient addHandler:[[RCTSamplingProfilerPackagerMethod alloc] initWithBridge:_bridge] - forMethod:@"pokeSamplingProfiler"]; - [packagerClient start]; -#endif -} - @end #else // #if RCT_DEV diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index 49216dcc4..050677cf5 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -423,6 +423,11 @@ 3D6B76D61E83DD3A008FA614 /* RCTConvert+Transform.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 945929C21DD62ADD00653A7D /* RCTConvert+Transform.h */; }; 3D6B76D71E83DD59008FA614 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */; }; 3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; }; + 3D7BFCE71EA8E1F4008DFB7A /* RCTPackagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFCE51EA8E1F4008DFB7A /* RCTPackagerConnection.h */; }; + 3D7BFCE81EA8E1F4008DFB7A /* RCTPackagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFCE51EA8E1F4008DFB7A /* RCTPackagerConnection.h */; }; + 3D7BFCE91EA8E1F4008DFB7A /* RCTPackagerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFCE61EA8E1F4008DFB7A /* RCTPackagerConnection.m */; }; + 3D7BFCEA1EA8E1F4008DFB7A /* RCTPackagerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFCE61EA8E1F4008DFB7A /* RCTPackagerConnection.m */; }; + 3D7BFCEB1EA8E23A008DFB7A /* RCTDevSettings.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = B505583C1E43DFB900F71A00 /* RCTDevSettings.h */; }; 3D80D9171DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; }; 3D80D9181DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; }; 3D80D9191DF6F7CF0028D040 /* JSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */; }; @@ -972,6 +977,7 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + 3D7BFCEB1EA8E23A008DFB7A /* RCTDevSettings.h in Copy Headers */, 3D0976C41E9739B400B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */, A12E9E1F1E5DEAEF0029001B /* RCTPackagerClient.h in Copy Headers */, A12E9E201E5DEAEF0029001B /* RCTPackagerClientResponder.h in Copy Headers */, @@ -1319,6 +1325,8 @@ 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = ""; }; 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCWrapper.cpp; sourceTree = ""; }; 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCWrapper.h; sourceTree = ""; }; + 3D7BFCE51EA8E1F4008DFB7A /* RCTPackagerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerConnection.h; sourceTree = ""; }; + 3D7BFCE61EA8E1F4008DFB7A /* RCTPackagerConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerConnection.m; sourceTree = ""; }; 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketObserverProtocol.h; sourceTree = ""; }; 3EDCA8A21D3591E700450C31 /* RCTErrorCustomizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorCustomizer.h; sourceTree = ""; }; 3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorInfo.h; sourceTree = ""; }; @@ -1370,16 +1378,16 @@ 83F15A171B7CC46900F10295 /* UIView+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+Private.h"; sourceTree = ""; }; 945929C21DD62ADD00653A7D /* RCTConvert+Transform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+Transform.h"; sourceTree = ""; }; 945929C31DD62ADD00653A7D /* RCTConvert+Transform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+Transform.m"; sourceTree = ""; }; - A12E9E171E5DEA350029001B /* RCTPackagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTPackagerClient.h; path = DevSupport/RCTPackagerClient.h; sourceTree = ""; }; - A12E9E181E5DEA350029001B /* RCTPackagerClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTPackagerClient.m; path = DevSupport/RCTPackagerClient.m; sourceTree = ""; }; - A12E9E191E5DEA350029001B /* RCTPackagerClientResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTPackagerClientResponder.h; path = DevSupport/RCTPackagerClientResponder.h; sourceTree = ""; }; - A12E9E1A1E5DEA350029001B /* RCTPackagerClientResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTPackagerClientResponder.m; path = DevSupport/RCTPackagerClientResponder.m; sourceTree = ""; }; + A12E9E171E5DEA350029001B /* RCTPackagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerClient.h; sourceTree = ""; }; + A12E9E181E5DEA350029001B /* RCTPackagerClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerClient.m; sourceTree = ""; }; + A12E9E191E5DEA350029001B /* RCTPackagerClientResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerClientResponder.h; sourceTree = ""; }; + A12E9E1A1E5DEA350029001B /* RCTPackagerClientResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerClientResponder.m; sourceTree = ""; }; A12E9E281E5DEB860029001B /* RCTReconnectingWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTReconnectingWebSocket.h; path = WebSocket/RCTReconnectingWebSocket.h; sourceTree = ""; }; A12E9E291E5DEB860029001B /* RCTSRWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTSRWebSocket.h; path = WebSocket/RCTSRWebSocket.h; sourceTree = ""; }; - A12E9E581E5DF8600029001B /* RCTReloadPackagerMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTReloadPackagerMethod.h; path = DevSupport/RCTReloadPackagerMethod.h; sourceTree = ""; }; - A12E9E591E5DF8600029001B /* RCTReloadPackagerMethod.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTReloadPackagerMethod.m; path = DevSupport/RCTReloadPackagerMethod.m; sourceTree = ""; }; - A12E9E8C1E5DFA620029001B /* RCTSamplingProfilerPackagerMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTSamplingProfilerPackagerMethod.h; path = DevSupport/RCTSamplingProfilerPackagerMethod.h; sourceTree = ""; }; - A12E9E8D1E5DFA620029001B /* RCTSamplingProfilerPackagerMethod.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RCTSamplingProfilerPackagerMethod.mm; path = DevSupport/RCTSamplingProfilerPackagerMethod.mm; sourceTree = ""; }; + A12E9E581E5DF8600029001B /* RCTReloadPackagerMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadPackagerMethod.h; sourceTree = ""; }; + A12E9E591E5DF8600029001B /* RCTReloadPackagerMethod.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReloadPackagerMethod.m; sourceTree = ""; }; + A12E9E8C1E5DFA620029001B /* RCTSamplingProfilerPackagerMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSamplingProfilerPackagerMethod.h; sourceTree = ""; }; + A12E9E8D1E5DFA620029001B /* RCTSamplingProfilerPackagerMethod.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTSamplingProfilerPackagerMethod.mm; sourceTree = ""; }; A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadCommand.h; sourceTree = ""; }; A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReloadCommand.m; sourceTree = ""; }; AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJavaScriptLoader.mm; sourceTree = ""; }; @@ -1463,10 +1471,6 @@ 58114A4E1AAE93D500E7D092 /* RCTAsyncLocalStorage.m */, 13D033611C1837FE0021DC29 /* RCTClipboard.h */, 13D033621C1837FE0021DC29 /* RCTClipboard.m */, - 13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */, - 13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */, - 13A0C2871B74F71200B29F6F /* RCTDevMenu.h */, - B505583B1E43DFB900F71A00 /* RCTDevMenu.m */, B505583C1E43DFB900F71A00 /* RCTDevSettings.h */, B505583D1E43DFB900F71A00 /* RCTDevSettings.mm */, CF85BC301E79EC6B00F1EF3B /* RCTDeviceInfo.h */, @@ -1812,16 +1816,22 @@ A12E9E161E5DEA260029001B /* DevSupport */ = { isa = PBXGroup; children = ( + 13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */, + 13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */, + 13A0C2871B74F71200B29F6F /* RCTDevMenu.h */, + B505583B1E43DFB900F71A00 /* RCTDevMenu.m */, A12E9E171E5DEA350029001B /* RCTPackagerClient.h */, A12E9E181E5DEA350029001B /* RCTPackagerClient.m */, - A12E9E581E5DF8600029001B /* RCTReloadPackagerMethod.h */, - A12E9E591E5DF8600029001B /* RCTReloadPackagerMethod.m */, A12E9E191E5DEA350029001B /* RCTPackagerClientResponder.h */, A12E9E1A1E5DEA350029001B /* RCTPackagerClientResponder.m */, + 3D7BFCE51EA8E1F4008DFB7A /* RCTPackagerConnection.h */, + 3D7BFCE61EA8E1F4008DFB7A /* RCTPackagerConnection.m */, + A12E9E581E5DF8600029001B /* RCTReloadPackagerMethod.h */, + A12E9E591E5DF8600029001B /* RCTReloadPackagerMethod.m */, A12E9E8C1E5DFA620029001B /* RCTSamplingProfilerPackagerMethod.h */, A12E9E8D1E5DFA620029001B /* RCTSamplingProfilerPackagerMethod.mm */, ); - name = DevSupport; + path = DevSupport; sourceTree = ""; }; A12E9E271E5DEB600029001B /* WebSocket */ = { @@ -1860,6 +1870,7 @@ 3D302F271DF828F800D6DDAE /* RCTLinkingManager.h in Headers */, 3D302F281DF828F800D6DDAE /* RCTNetworking.h in Headers */, 3D302F291DF828F800D6DDAE /* RCTNetworkTask.h in Headers */, + 3D7BFCE81EA8E1F4008DFB7A /* RCTPackagerConnection.h in Headers */, 594AD5D21E46D87500B07237 /* RCTScrollContentViewManager.h in Headers */, 594AD5CE1E46D87500B07237 /* RCTScrollContentShadowView.h in Headers */, 3D302F2A1DF828F800D6DDAE /* RCTPushNotificationManager.h in Headers */, @@ -2140,6 +2151,7 @@ 594AD5CD1E46D87500B07237 /* RCTScrollContentShadowView.h in Headers */, 3D80DA731DF820620028D040 /* RCTNavigator.h in Headers */, 3D80DA741DF820620028D040 /* RCTNavigatorManager.h in Headers */, + 3D7BFCE71EA8E1F4008DFB7A /* RCTPackagerConnection.h in Headers */, 3D80DA751DF820620028D040 /* RCTNavItem.h in Headers */, 3D80DA761DF820620028D040 /* RCTNavItemManager.h in Headers */, 3D80DA771DF820620028D040 /* RCTPicker.h in Headers */, @@ -2450,6 +2462,7 @@ 2D3B5EBF1D9B093300451313 /* RCTJSCProfiler.m in Sources */, 2D3B5EA11D9B08B600451313 /* RCTModuleData.mm in Sources */, 2D3B5EEA1D9B09CD00451313 /* RCTTabBar.m in Sources */, + 3D7BFCEA1EA8E1F4008DFB7A /* RCTPackagerConnection.m in Sources */, 2D3B5EAE1D9B08F800451313 /* RCTEventEmitter.m in Sources */, A12E9E901E5DFA6E0029001B /* RCTSamplingProfilerPackagerMethod.mm in Sources */, 2D3B5ECA1D9B095F00451313 /* RCTComponentData.m in Sources */, @@ -2627,6 +2640,7 @@ 14F3620E1AABD06A001CE568 /* RCTSwitchManager.m in Sources */, 13B080201A69489C00A75B9A /* RCTActivityIndicatorViewManager.m in Sources */, 13E067561A70F44B002CDEE1 /* RCTViewManager.m in Sources */, + 3D7BFCE91EA8E1F4008DFB7A /* RCTPackagerConnection.m in Sources */, 13BB3D021BECD54500932C10 /* RCTImageSource.m in Sources */, 58C571C11AA56C1900CDF9C8 /* RCTDatePickerManager.m in Sources */, 1450FF8A1BCFF28A00208362 /* RCTProfileTrampoline-x86_64.S in Sources */, diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj index fce1d765d..0f22b87c0 100644 --- a/React/ReactCxx.xcodeproj/project.pbxproj +++ b/React/ReactCxx.xcodeproj/project.pbxproj @@ -152,11 +152,7 @@ 13EBC6811E28733C00880AC5 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; }; 13EBC6821E28733C00880AC5 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; }; 13F17A851B8493E5007D4C75 /* RCTRedBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 13F17A841B8493E5007D4C75 /* RCTRedBox.m */; }; - 13F880361E296D2800C3C7A1 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; }; - 13F880371E296D2800C3C7A1 /* JSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; }; 13F880381E296D2800C3C7A1 /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; }; - 13F8803A1E296D2800C3C7A1 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; }; - 13F8803B1E296D2800C3C7A1 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; }; 13F880411E29709F00C3C7A1 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139D7E881E25C6D100323FB7 /* libdouble-conversion.a */; }; 13F887581E2971D400C3C7A1 /* Demangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887521E2971C500C3C7A1 /* Demangle.cpp */; }; 13F887591E2971D400C3C7A1 /* StringBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887531E2971C500C3C7A1 /* StringBase.cpp */; }; @@ -492,6 +488,36 @@ 3D7AA9C41E548CD5001955CF /* NSDataBigString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */; }; 3D7AA9C51E548CDB001955CF /* NSDataBigString.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7454B31E54786200E74ADD /* NSDataBigString.h */; }; 3D7AA9C61E548CDD001955CF /* NSDataBigString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */; }; + 3D7BFD151EA8E351008DFB7A /* RCTPackagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0B1EA8E351008DFB7A /* RCTPackagerClient.h */; }; + 3D7BFD161EA8E351008DFB7A /* RCTPackagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0B1EA8E351008DFB7A /* RCTPackagerClient.h */; }; + 3D7BFD171EA8E351008DFB7A /* RCTPackagerClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD0C1EA8E351008DFB7A /* RCTPackagerClient.m */; }; + 3D7BFD181EA8E351008DFB7A /* RCTPackagerClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD0C1EA8E351008DFB7A /* RCTPackagerClient.m */; }; + 3D7BFD191EA8E351008DFB7A /* RCTPackagerClientResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0D1EA8E351008DFB7A /* RCTPackagerClientResponder.h */; }; + 3D7BFD1A1EA8E351008DFB7A /* RCTPackagerClientResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0D1EA8E351008DFB7A /* RCTPackagerClientResponder.h */; }; + 3D7BFD1B1EA8E351008DFB7A /* RCTPackagerClientResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD0E1EA8E351008DFB7A /* RCTPackagerClientResponder.m */; }; + 3D7BFD1C1EA8E351008DFB7A /* RCTPackagerClientResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD0E1EA8E351008DFB7A /* RCTPackagerClientResponder.m */; }; + 3D7BFD1D1EA8E351008DFB7A /* RCTPackagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0F1EA8E351008DFB7A /* RCTPackagerConnection.h */; }; + 3D7BFD1E1EA8E351008DFB7A /* RCTPackagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0F1EA8E351008DFB7A /* RCTPackagerConnection.h */; }; + 3D7BFD1F1EA8E351008DFB7A /* RCTPackagerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD101EA8E351008DFB7A /* RCTPackagerConnection.m */; }; + 3D7BFD201EA8E351008DFB7A /* RCTPackagerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD101EA8E351008DFB7A /* RCTPackagerConnection.m */; }; + 3D7BFD211EA8E351008DFB7A /* RCTReloadPackagerMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD111EA8E351008DFB7A /* RCTReloadPackagerMethod.h */; }; + 3D7BFD221EA8E351008DFB7A /* RCTReloadPackagerMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD111EA8E351008DFB7A /* RCTReloadPackagerMethod.h */; }; + 3D7BFD231EA8E351008DFB7A /* RCTReloadPackagerMethod.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD121EA8E351008DFB7A /* RCTReloadPackagerMethod.m */; }; + 3D7BFD241EA8E351008DFB7A /* RCTReloadPackagerMethod.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD121EA8E351008DFB7A /* RCTReloadPackagerMethod.m */; }; + 3D7BFD251EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD131EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.h */; }; + 3D7BFD261EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD131EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.h */; }; + 3D7BFD271EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD141EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.mm */; }; + 3D7BFD281EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7BFD141EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.mm */; }; + 3D7BFD291EA8E37B008DFB7A /* RCTDevSettings.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130E3D861E6A082100ACE484 /* RCTDevSettings.h */; }; + 3D7BFD2D1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2B1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h */; }; + 3D7BFD2E1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2B1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h */; }; + 3D7BFD2F1EA8E3FA008DFB7A /* RCTSRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */; }; + 3D7BFD301EA8E3FA008DFB7A /* RCTSRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */; }; + 3D7BFD311EA8E41F008DFB7A /* RCTPackagerClient.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0B1EA8E351008DFB7A /* RCTPackagerClient.h */; }; + 3D7BFD321EA8E41F008DFB7A /* RCTPackagerClientResponder.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0D1EA8E351008DFB7A /* RCTPackagerClientResponder.h */; }; + 3D7BFD331EA8E433008DFB7A /* RCTPackagerClient.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0B1EA8E351008DFB7A /* RCTPackagerClient.h */; }; + 3D7BFD341EA8E433008DFB7A /* RCTPackagerClientResponder.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD0D1EA8E351008DFB7A /* RCTPackagerClientResponder.h */; }; + 3D7BFD351EA8E43F008DFB7A /* RCTDevSettings.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130E3D861E6A082100ACE484 /* RCTDevSettings.h */; }; 3D80D9181DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; }; 3D80D91B1DF6F8200028D040 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; }; 3D80D91F1DF6FA890028D040 /* RCTImageLoader.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */; }; @@ -1066,6 +1092,9 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + 3D7BFD351EA8E43F008DFB7A /* RCTDevSettings.h in Copy Headers */, + 3D7BFD331EA8E433008DFB7A /* RCTPackagerClient.h in Copy Headers */, + 3D7BFD341EA8E433008DFB7A /* RCTPackagerClientResponder.h in Copy Headers */, 3D0976D71E9739FB00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */, 3DA981E91E5B0F7F004F2374 /* RCTJSCSamplingProfiler.h in Copy Headers */, 3DA981EA1E5B0F7F004F2374 /* RCTAccessibilityManager.h in Copy Headers */, @@ -1259,6 +1288,9 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + 3D7BFD311EA8E41F008DFB7A /* RCTPackagerClient.h in Copy Headers */, + 3D7BFD321EA8E41F008DFB7A /* RCTPackagerClientResponder.h in Copy Headers */, + 3D7BFD291EA8E37B008DFB7A /* RCTDevSettings.h in Copy Headers */, 3D0976D81E973A0200B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */, 3D80D91F1DF6FA890028D040 /* RCTImageLoader.h in Copy Headers */, 3D80D9201DF6FA890028D040 /* RCTImageStoreManager.h in Copy Headers */, @@ -1713,6 +1745,18 @@ 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCWrapper.cpp; sourceTree = ""; }; 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCWrapper.h; sourceTree = ""; }; 3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NSDataBigString.mm; sourceTree = ""; }; + 3D7BFD0B1EA8E351008DFB7A /* RCTPackagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerClient.h; sourceTree = ""; }; + 3D7BFD0C1EA8E351008DFB7A /* RCTPackagerClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerClient.m; sourceTree = ""; }; + 3D7BFD0D1EA8E351008DFB7A /* RCTPackagerClientResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerClientResponder.h; sourceTree = ""; }; + 3D7BFD0E1EA8E351008DFB7A /* RCTPackagerClientResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerClientResponder.m; sourceTree = ""; }; + 3D7BFD0F1EA8E351008DFB7A /* RCTPackagerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerConnection.h; sourceTree = ""; }; + 3D7BFD101EA8E351008DFB7A /* RCTPackagerConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerConnection.m; sourceTree = ""; }; + 3D7BFD111EA8E351008DFB7A /* RCTReloadPackagerMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadPackagerMethod.h; sourceTree = ""; }; + 3D7BFD121EA8E351008DFB7A /* RCTReloadPackagerMethod.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReloadPackagerMethod.m; sourceTree = ""; }; + 3D7BFD131EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSamplingProfilerPackagerMethod.h; sourceTree = ""; }; + 3D7BFD141EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTSamplingProfilerPackagerMethod.mm; sourceTree = ""; }; + 3D7BFD2B1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTReconnectingWebSocket.h; path = WebSocket/RCTReconnectingWebSocket.h; sourceTree = ""; }; + 3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTSRWebSocket.h; path = WebSocket/RCTSRWebSocket.h; sourceTree = ""; }; 3D92B0A71E03699D0018521A /* CxxModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CxxModule.h; sourceTree = ""; }; 3D92B0A81E03699D0018521A /* CxxNativeModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CxxNativeModule.cpp; sourceTree = ""; }; 3D92B0A91E03699D0018521A /* CxxNativeModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CxxNativeModule.h; sourceTree = ""; }; @@ -2038,10 +2082,6 @@ 58114A4E1AAE93D500E7D092 /* RCTAsyncLocalStorage.m */, 13D033611C1837FE0021DC29 /* RCTClipboard.h */, 13D033621C1837FE0021DC29 /* RCTClipboard.m */, - 13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */, - 13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */, - 13A0C2871B74F71200B29F6F /* RCTDevMenu.h */, - 13A0C2881B74F71200B29F6F /* RCTDevMenu.m */, 13D9FEE91CDCCECF00158BD7 /* RCTEventEmitter.h */, 13D9FEEA1CDCCECF00158BD7 /* RCTEventEmitter.m */, 13B07FE91A69327A00A75B9A /* RCTExceptionsManager.h */, @@ -2205,6 +2245,7 @@ 3D1FA0891DE4F4B900E03CC6 /* LinkingIOS */, 3D1FA0791DE4F2D200E03CC6 /* Network */, 3D1FA08A1DE4F4D600E03CC6 /* PushNotificationIOS */, + 3D7BFD2A1EA8E3D3008DFB7A /* WebSocket */, ); name = Libraries; path = ../Libraries; @@ -2263,6 +2304,36 @@ path = jschelpers; sourceTree = ""; }; + 3D7BFD0A1EA8E2D1008DFB7A /* DevSupport */ = { + isa = PBXGroup; + children = ( + 13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */, + 13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */, + 13A0C2871B74F71200B29F6F /* RCTDevMenu.h */, + 13A0C2881B74F71200B29F6F /* RCTDevMenu.m */, + 3D7BFD0B1EA8E351008DFB7A /* RCTPackagerClient.h */, + 3D7BFD0C1EA8E351008DFB7A /* RCTPackagerClient.m */, + 3D7BFD0D1EA8E351008DFB7A /* RCTPackagerClientResponder.h */, + 3D7BFD0E1EA8E351008DFB7A /* RCTPackagerClientResponder.m */, + 3D7BFD0F1EA8E351008DFB7A /* RCTPackagerConnection.h */, + 3D7BFD101EA8E351008DFB7A /* RCTPackagerConnection.m */, + 3D7BFD111EA8E351008DFB7A /* RCTReloadPackagerMethod.h */, + 3D7BFD121EA8E351008DFB7A /* RCTReloadPackagerMethod.m */, + 3D7BFD131EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.h */, + 3D7BFD141EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.mm */, + ); + path = DevSupport; + sourceTree = ""; + }; + 3D7BFD2A1EA8E3D3008DFB7A /* WebSocket */ = { + isa = PBXGroup; + children = ( + 3D7BFD2B1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h */, + 3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */, + ); + name = WebSocket; + sourceTree = ""; + }; 3D92B1151E036A690018521A /* ThirdParty */ = { isa = PBXGroup; children = ( @@ -2308,10 +2379,11 @@ 83CBBA2F1A601D0F00E9B192 /* React */ = { isa = PBXGroup; children = ( - 1304439E1E3FEA8B00D93A67 /* CxxUtils */, + 83CBBA491A601E3B00E9B192 /* Base */, 13134C721E296B2A00B9F3CB /* CxxBridge */, 13134C7D1E296B2A00B9F3CB /* CxxModule */, - 83CBBA491A601E3B00E9B192 /* Base */, + 1304439E1E3FEA8B00D93A67 /* CxxUtils */, + 3D7BFD0A1EA8E2D1008DFB7A /* DevSupport */, 13B07FE01A69315300A75B9A /* Modules */, 1450FF7F1BCFF28A00208362 /* Profiler */, 13B07FF31A6947C200A75B9A /* Views */, @@ -2486,13 +2558,17 @@ 13134C9D1E296B2A00B9F3CB /* RCTCxxModule.h in Headers */, 59FBEFB11E46D91C0095D885 /* RCTScrollContentShadowView.h in Headers */, 130443A31E3FEAAE00D93A67 /* RCTFollyConvert.h in Headers */, + 3D7BFD1E1EA8E351008DFB7A /* RCTPackagerConnection.h in Headers */, 59FBEFB51E46D91C0095D885 /* RCTScrollContentViewManager.h in Headers */, 3D302F241DF828F800D6DDAE /* RCTImageLoader.h in Headers */, 3D302F251DF828F800D6DDAE /* RCTImageStoreManager.h in Headers */, + 3D7BFD1A1EA8E351008DFB7A /* RCTPackagerClientResponder.h in Headers */, 3D302F261DF828F800D6DDAE /* RCTResizeMode.h in Headers */, 3D302F271DF828F800D6DDAE /* RCTLinkingManager.h in Headers */, + 3D7BFD161EA8E351008DFB7A /* RCTPackagerClient.h in Headers */, 3D302F281DF828F800D6DDAE /* RCTNetworking.h in Headers */, 3D302F291DF828F800D6DDAE /* RCTNetworkTask.h in Headers */, + 3D7BFD2E1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h in Headers */, 3D302F2A1DF828F800D6DDAE /* RCTPushNotificationManager.h in Headers */, 3D302F2B1DF828F800D6DDAE /* RCTAssert.h in Headers */, 3D302F2C1DF828F800D6DDAE /* RCTBridge.h in Headers */, @@ -2516,6 +2592,7 @@ 3D302F3D1DF828F800D6DDAE /* RCTJSStackFrame.h in Headers */, 3D302F3E1DF828F800D6DDAE /* RCTKeyCommands.h in Headers */, 135A9C031E7B0F6100587AEB /* RCTJSCErrorHandling.h in Headers */, + 3D7BFD261EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.h in Headers */, 3D302F3F1DF828F800D6DDAE /* RCTLog.h in Headers */, 3D302F401DF828F800D6DDAE /* RCTModuleData.h in Headers */, 3D302F411DF828F800D6DDAE /* RCTModuleMethod.h in Headers */, @@ -2529,6 +2606,7 @@ 3D302F4A1DF828F800D6DDAE /* RCTRootViewInternal.h in Headers */, 3D302F4B1DF828F800D6DDAE /* RCTTouchEvent.h in Headers */, 3D302F4C1DF828F800D6DDAE /* RCTTouchHandler.h in Headers */, + 3D7BFD221EA8E351008DFB7A /* RCTReloadPackagerMethod.h in Headers */, 3D302F4D1DF828F800D6DDAE /* RCTURLRequestDelegate.h in Headers */, 3D302F4E1DF828F800D6DDAE /* RCTURLRequestHandler.h in Headers */, 3D302F4F1DF828F800D6DDAE /* RCTUtils.h in Headers */, @@ -2557,6 +2635,7 @@ 3D302F691DF828F800D6DDAE /* RCTProfile.h in Headers */, 3D302F6A1DF828F800D6DDAE /* RCTActivityIndicatorView.h in Headers */, 3D302F6B1DF828F800D6DDAE /* RCTActivityIndicatorViewManager.h in Headers */, + 3D7BFD301EA8E3FA008DFB7A /* RCTSRWebSocket.h in Headers */, 3D302F6C1DF828F800D6DDAE /* RCTAnimationType.h in Headers */, 3D302F6D1DF828F800D6DDAE /* RCTAutoInsetsProtocol.h in Headers */, 3D302F6E1DF828F800D6DDAE /* RCTBorderDrawing.h in Headers */, @@ -2748,9 +2827,12 @@ 3D80DA211DF820620028D040 /* RCTBridge.h in Headers */, 13F880381E296D2800C3C7A1 /* JSCWrapper.h in Headers */, 3D80DA221DF820620028D040 /* RCTBridge+Private.h in Headers */, + 3D7BFD211EA8E351008DFB7A /* RCTReloadPackagerMethod.h in Headers */, 3D80DA231DF820620028D040 /* RCTBridgeDelegate.h in Headers */, 3D80DA241DF820620028D040 /* RCTBridgeMethod.h in Headers */, + 3D7BFD151EA8E351008DFB7A /* RCTPackagerClient.h in Headers */, 3D80DA251DF820620028D040 /* RCTBridgeModule.h in Headers */, + 3D7BFD191EA8E351008DFB7A /* RCTPackagerClientResponder.h in Headers */, 3D80DA261DF820620028D040 /* RCTBundleURLProvider.h in Headers */, 3D80DA271DF820620028D040 /* RCTConvert.h in Headers */, 3D80DA281DF820620028D040 /* RCTDefines.h in Headers */, @@ -2758,11 +2840,12 @@ 3D80DA2A1DF820620028D040 /* RCTErrorCustomizer.h in Headers */, 3D80DA2B1DF820620028D040 /* RCTErrorInfo.h in Headers */, 1384E2081E806D4E00545659 /* RCTNativeModule.h in Headers */, + 3D7BFD2D1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h in Headers */, 3D80DA2C1DF820620028D040 /* RCTEventDispatcher.h in Headers */, 3D80DA2D1DF820620028D040 /* RCTFrameUpdate.h in Headers */, 3D80DA2E1DF820620028D040 /* RCTImageSource.h in Headers */, - 13F880361E296D2800C3C7A1 /* JavaScriptCore.h in Headers */, 3D80DA2F1DF820620028D040 /* RCTInvalidating.h in Headers */, + 3D7BFD251EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.h in Headers */, 3D80DA301DF820620028D040 /* RCTJavaScriptExecutor.h in Headers */, 135A9BFF1E7B0EE600587AEB /* RCTJSCHelpers.h in Headers */, 3D80DA311DF820620028D040 /* RCTJavaScriptLoader.h in Headers */, @@ -2772,7 +2855,6 @@ 3D80DA331DF820620028D040 /* RCTKeyCommands.h in Headers */, 3D80DA341DF820620028D040 /* RCTLog.h in Headers */, 3D80DA351DF820620028D040 /* RCTModuleData.h in Headers */, - 13F8803B1E296D2800C3C7A1 /* Value.h in Headers */, 3D80DA361DF820620028D040 /* RCTModuleMethod.h in Headers */, 3D80DA371DF820620028D040 /* RCTMultipartDataTask.h in Headers */, 3D80DA381DF820620028D040 /* RCTMultipartStreamReader.h in Headers */, @@ -2804,6 +2886,7 @@ 59A7B9FD1E577DBF0068EDBF /* RCTRootContentView.h in Headers */, 3D80DA521DF820620028D040 /* RCTExceptionsManager.h in Headers */, 3D80DA531DF820620028D040 /* RCTI18nManager.h in Headers */, + 3D7BFD2F1EA8E3FA008DFB7A /* RCTSRWebSocket.h in Headers */, 3D80DA541DF820620028D040 /* RCTI18nUtil.h in Headers */, 3D80DA551DF820620028D040 /* RCTKeyboardObserver.h in Headers */, 3D80DA561DF820620028D040 /* RCTRedBox.h in Headers */, @@ -2846,6 +2929,7 @@ 3D80DA7C1DF820620028D040 /* RCTRefreshControlManager.h in Headers */, 3D80DA7D1DF820620028D040 /* RCTRootShadowView.h in Headers */, 3D80DA7E1DF820620028D040 /* RCTScrollableProtocol.h in Headers */, + 3D7BFD1D1EA8E351008DFB7A /* RCTPackagerConnection.h in Headers */, 3D80DA7F1DF820620028D040 /* RCTScrollView.h in Headers */, 3D80DA801DF820620028D040 /* RCTScrollViewManager.h in Headers */, 3D80DA811DF820620028D040 /* RCTSegmentedControl.h in Headers */, @@ -2853,13 +2937,11 @@ 3D80DA831DF820620028D040 /* RCTShadowView.h in Headers */, 3D80DA841DF820620028D040 /* RCTSlider.h in Headers */, 3D80DA851DF820620028D040 /* RCTSliderManager.h in Headers */, - 13F880371E296D2800C3C7A1 /* JSCHelpers.h in Headers */, 3D80DA861DF820620028D040 /* RCTSwitch.h in Headers */, 3D80DA871DF820620028D040 /* RCTSwitchManager.h in Headers */, 3D80DA881DF820620028D040 /* RCTTabBar.h in Headers */, 3D80DA891DF820620028D040 /* RCTTabBarItem.h in Headers */, 3D80DA8A1DF820620028D040 /* RCTTabBarItemManager.h in Headers */, - 13F8803A1E296D2800C3C7A1 /* Unicode.h in Headers */, 3D80DA8B1DF820620028D040 /* RCTTabBarManager.h in Headers */, 3D80DA8C1DF820620028D040 /* RCTTextDecorationLineType.h in Headers */, 3D80DA8D1DF820620028D040 /* RCTView.h in Headers */, @@ -3264,6 +3346,7 @@ 2D3B5EE31D9B09B700451313 /* RCTSegmentedControl.m in Sources */, 130443DF1E401B0D00D93A67 /* RCTTVView.m in Sources */, 130443A41E3FEAC600D93A67 /* RCTFollyConvert.mm in Sources */, + 3D7BFD201EA8E351008DFB7A /* RCTPackagerConnection.m in Sources */, 2D3B5EB71D9B091800451313 /* RCTRedBox.m in Sources */, 3D7AA9C61E548CDD001955CF /* NSDataBigString.mm in Sources */, 13134C8F1E296B2A00B9F3CB /* RCTMessageThread.mm in Sources */, @@ -3276,6 +3359,7 @@ 2D3B5EED1D9B09D700451313 /* RCTTabBarManager.m in Sources */, 2D3B5EEF1D9B09DC00451313 /* RCTViewManager.m in Sources */, 13134C971E296B2A00B9F3CB /* RCTObjcExecutor.mm in Sources */, + 3D7BFD241EA8E351008DFB7A /* RCTReloadPackagerMethod.m in Sources */, 2D3B5EE11D9B09B000451313 /* RCTScrollView.m in Sources */, 130E3D8B1E6A083900ACE484 /* RCTDevSettings.mm in Sources */, 2D3B5ED81D9B098A00451313 /* RCTNavigatorManager.m in Sources */, @@ -3289,10 +3373,12 @@ CF2731C31E7B8DF30044CA4F /* RCTDeviceInfo.m in Sources */, 2D3B5EB11D9B090100451313 /* RCTAppState.m in Sources */, 1384E20B1E806D5B00545659 /* RCTNativeModule.mm in Sources */, + 3D7BFD1C1EA8E351008DFB7A /* RCTPackagerClientResponder.m in Sources */, 2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */, 2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */, 2D3B5EEE1D9B09DA00451313 /* RCTView.m in Sources */, 2D3B5E981D9B089500451313 /* RCTConvert.m in Sources */, + 3D7BFD181EA8E351008DFB7A /* RCTPackagerClient.m in Sources */, 2D3B5EA71D9B08CE00451313 /* RCTTouchHandler.m in Sources */, 3D05745A1DE5FFF500184BB4 /* RCTJavaScriptLoader.mm in Sources */, 2D3B5EA41D9B08C200451313 /* RCTPerformanceLogger.m in Sources */, @@ -3323,6 +3409,7 @@ 2D74EAFA1DAE9590003B751B /* RCTMultipartDataTask.m in Sources */, 2D3B5EC51D9B094D00451313 /* RCTProfileTrampoline-i386.S in Sources */, 2D3B5EC41D9B094B00451313 /* RCTProfileTrampoline-arm64.S in Sources */, + 3D7BFD281EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.mm in Sources */, 2D3B5EBB1D9B092300451313 /* RCTI18nManager.m in Sources */, 2D3B5EBE1D9B092D00451313 /* RCTUIManager.m in Sources */, 2D3B5EDD1D9B09A300451313 /* RCTProgressViewManager.m in Sources */, @@ -3448,6 +3535,7 @@ 14C2CA761B3AC64F00E6CBB2 /* RCTFrameUpdate.m in Sources */, 13134C861E296B2A00B9F3CB /* RCTCxxBridge.mm in Sources */, 13B07FEF1A69327A00A75B9A /* RCTAlertManager.m in Sources */, + 3D7BFD231EA8E351008DFB7A /* RCTReloadPackagerMethod.m in Sources */, 352DCFF01D19F4C20056D623 /* RCTI18nUtil.m in Sources */, 008341F61D1DB34400876D9A /* RCTJSStackFrame.m in Sources */, 13134C961E296B2A00B9F3CB /* RCTObjcExecutor.mm in Sources */, @@ -3456,6 +3544,7 @@ 830A229E1A66C68A008503DA /* RCTRootView.m in Sources */, 13B07FF01A69327A00A75B9A /* RCTExceptionsManager.m in Sources */, 13A0C28A1B74F71200B29F6F /* RCTDevMenu.m in Sources */, + 3D7BFD271EA8E351008DFB7A /* RCTSamplingProfilerPackagerMethod.mm in Sources */, 13BCE8091C99CB9D00DD7AAD /* RCTRootShadowView.m in Sources */, 14C2CA711B3AC63800E6CBB2 /* RCTModuleMethod.m in Sources */, 006FC4141D9B20820057AAAD /* RCTMultipartDataTask.m in Sources */, @@ -3467,6 +3556,7 @@ 130E3D891E6A082100ACE484 /* RCTDevSettings.mm in Sources */, 13513F3C1B1F43F400FCE529 /* RCTProgressViewManager.m in Sources */, 14F7A0F01BDA714B003C6C10 /* RCTFPSGraph.m in Sources */, + 3D7BFD171EA8E351008DFB7A /* RCTPackagerClient.m in Sources */, 14F3620D1AABD06A001CE568 /* RCTSwitch.m in Sources */, 13134C8E1E296B2A00B9F3CB /* RCTMessageThread.mm in Sources */, 3D1E68DB1CABD13900DD7465 /* RCTDisplayLink.m in Sources */, @@ -3475,6 +3565,7 @@ 13E067561A70F44B002CDEE1 /* RCTViewManager.m in Sources */, 13BB3D021BECD54500932C10 /* RCTImageSource.m in Sources */, 13134CA21E296B2A00B9F3CB /* RCTCxxUtils.mm in Sources */, + 3D7BFD1B1EA8E351008DFB7A /* RCTPackagerClientResponder.m in Sources */, 58C571C11AA56C1900CDF9C8 /* RCTDatePickerManager.m in Sources */, 1450FF8A1BCFF28A00208362 /* RCTProfileTrampoline-x86_64.S in Sources */, 13D9FEEB1CDCCECF00158BD7 /* RCTEventEmitter.m in Sources */, @@ -3512,6 +3603,7 @@ 13D9FEEE1CDCD93000158BD7 /* RCTKeyboardObserver.m in Sources */, 135A9C001E7B0EE600587AEB /* RCTJSCHelpers.mm in Sources */, B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */, + 3D7BFD1F1EA8E351008DFB7A /* RCTPackagerConnection.m in Sources */, 13456E931ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m in Sources */, 137327E91AA5CF210034F82E /* RCTTabBarItemManager.m in Sources */, 13A1F71E1A75392D00D3D453 /* RCTKeyCommands.m in Sources */,