diff --git a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m index c58e33b38..fd67246ce 100644 --- a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m +++ b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m @@ -11,7 +11,6 @@ #import #import -#import #import #import diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m index 6aba194ed..93d41779d 100644 --- a/React/Base/RCTBridge.m +++ b/React/Base/RCTBridge.m @@ -12,9 +12,9 @@ #import -#import "RCTBridge+JavaScriptCore.h" #import "RCTConvert.h" #import "RCTEventDispatcher.h" +#import "RCTJSEnvironment.h" #import "RCTLog.h" #import "RCTModuleData.h" #import "RCTPerformanceLogger.h" diff --git a/React/Base/RCTBridge+JavaScriptCore.h b/React/Base/RCTJSEnvironment.h similarity index 85% rename from React/Base/RCTBridge+JavaScriptCore.h rename to React/Base/RCTJSEnvironment.h index 00a1501cf..a135f62a5 100644 --- a/React/Base/RCTBridge+JavaScriptCore.h +++ b/React/Base/RCTJSEnvironment.h @@ -11,16 +11,19 @@ #import -@interface RCTBridge (JavaScriptCore) +@protocol RCTJSEnvironment /** * The JSContext used by the bridge. */ @property (nonatomic, readonly, strong) JSContext *jsContext; - /** * The raw JSGlobalContextRef used by the bridge. */ @property (nonatomic, readonly, assign) JSGlobalContextRef jsContextRef; @end + +@interface RCTBridge (RCTJSEnvironment) + +@end diff --git a/React/DevSupport/RCTPackagerConnectionBridgeConfig.m b/React/DevSupport/RCTPackagerConnectionBridgeConfig.m index ea57d6883..4c1978187 100644 --- a/React/DevSupport/RCTPackagerConnectionBridgeConfig.m +++ b/React/DevSupport/RCTPackagerConnectionBridgeConfig.m @@ -11,6 +11,7 @@ #import +#import "RCTJSEnvironment.h" #import "RCTReloadPackagerMethod.h" #import "RCTSamplingProfilerPackagerMethod.h" @@ -48,7 +49,7 @@ { return @{ @"reload": [[RCTReloadPackagerMethod alloc] initWithBridge:_bridge], - @"pokeSamplingProfiler": [[RCTSamplingProfilerPackagerMethod alloc] initWithBridge:_bridge] + @"pokeSamplingProfiler": [[RCTSamplingProfilerPackagerMethod alloc] initWithJSEnvironment:_bridge] }; } diff --git a/React/DevSupport/RCTSamplingProfilerPackagerMethod.h b/React/DevSupport/RCTSamplingProfilerPackagerMethod.h index 386c21d0f..8ffff9bdd 100644 --- a/React/DevSupport/RCTSamplingProfilerPackagerMethod.h +++ b/React/DevSupport/RCTSamplingProfilerPackagerMethod.h @@ -9,13 +9,13 @@ #import -@class RCTBridge; +@protocol RCTJSEnvironment; #if RCT_DEV // Only supported in dev mode @interface RCTSamplingProfilerPackagerMethod : NSObject -- (instancetype)initWithBridge:(RCTBridge *)bridge; +- (instancetype)initWithJSEnvironment:(id)jsEnvironment; @end diff --git a/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm b/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm index 89dcee5bb..a8bde1fbf 100644 --- a/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm +++ b/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm @@ -11,29 +11,28 @@ #import -#import #import -#import "RCTBridge.h" +#import "RCTJSEnvironment.h" #import "RCTLog.h" #if RCT_DEV // Only supported in dev mode @implementation RCTSamplingProfilerPackagerMethod { - __weak RCTBridge *_bridge; + __weak id _jsEnvironment; } -- (instancetype)initWithBridge:(RCTBridge *)bridge +- (instancetype)initWithJSEnvironment:(id)jsEnvironment { if (self = [super init]) { - _bridge = bridge; + _jsEnvironment = jsEnvironment; } return self; } - (void)handleRequest:(__unused id)params withResponder:(RCTPackagerClientResponder *)responder { - JSGlobalContextRef globalContext = [_bridge jsContextRef]; + JSGlobalContextRef globalContext = _jsEnvironment.jsContextRef; if (!JSC_JSSamplingProfilerEnabled(globalContext)) { [responder respondWithError:@"The JSSamplingProfiler is disabled. See 'iOS specific setup' section here https://fburl.com/u4lw7xeq for some help"]; return; @@ -44,7 +43,7 @@ if (JSC_JSValueGetType(globalContext, jsResult) == kJSTypeNull) { [responder respondWithResult:@"started"]; } else { - JSContext *context = [_bridge jsContext]; + JSContext *context = _jsEnvironment.jsContext; NSString *results = [[JSC_JSValue(globalContext) valueWithJSValueRef:jsResult inContext:context] toObject]; [responder respondWithResult:results]; } diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm index f53ca65d0..705e73990 100644 --- a/React/Modules/RCTDevSettings.mm +++ b/React/Modules/RCTDevSettings.mm @@ -15,12 +15,12 @@ #import -#import "RCTBridge+JavaScriptCore.h" #import "RCTBridge+Private.h" #import "RCTBridgeModule.h" #import "RCTEventDispatcher.h" #import "RCTInspectorDevServerHelper.h" #import "RCTJSCSamplingProfiler.h" +#import "RCTJSEnvironment.h" #import "RCTLog.h" #import "RCTProfile.h" #import "RCTUtils.h" diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index fee3eda20..4fc28ee6d 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -342,10 +342,6 @@ 369123E11DDC75850095B341 /* RCTJSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */; }; 391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; }; 3D05745A1DE5FFF500184BB4 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; }; - 3D0976D51E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */; }; - 3D0976D61E9739F000B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */; }; - 3D0976D71E9739FB00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */; }; - 3D0976D81E973A0200B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */; }; 3D0B84221EC0B3F600B2BD8E /* RCTResizeMode.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0851DE4F3A000E03CC6 /* RCTResizeMode.h */; }; 3D0B84231EC0B40D00B2BD8E /* RCTImageLoader.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */; }; 3D0B84241EC0B40D00B2BD8E /* RCTImageStoreManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0841DE4F3A000E03CC6 /* RCTImageStoreManager.h */; }; @@ -1065,6 +1061,10 @@ C6194AAF1EF156280034D062 /* RCTPackagerConnectionBridgeConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = C6194AAA1EF156280034D062 /* RCTPackagerConnectionBridgeConfig.m */; }; C6194AB01EF156280034D062 /* RCTPackagerConnectionConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = C6194AAB1EF156280034D062 /* RCTPackagerConnectionConfig.h */; }; C6194AB11EF156280034D062 /* RCTPackagerConnectionConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = C6194AAB1EF156280034D062 /* RCTPackagerConnectionConfig.h */; }; + C6827DF61EF17CCC00D66BEF /* RCTJSEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = C6827DF51EF17CCC00D66BEF /* RCTJSEnvironment.h */; }; + C6827DF71EF17CCC00D66BEF /* RCTJSEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = C6827DF51EF17CCC00D66BEF /* RCTJSEnvironment.h */; }; + C6827DFB1EF1800E00D66BEF /* RCTJSEnvironment.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C6827DF51EF17CCC00D66BEF /* RCTJSEnvironment.h */; }; + C6827DFC1EF1801B00D66BEF /* RCTJSEnvironment.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C6827DF51EF17CCC00D66BEF /* RCTJSEnvironment.h */; }; CF2731C01E7B8DE40044CA4F /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF2731BE1E7B8DE40044CA4F /* RCTDeviceInfo.h */; }; CF2731C11E7B8DE40044CA4F /* RCTDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CF2731BF1E7B8DE40044CA4F /* RCTDeviceInfo.m */; }; CF2731C21E7B8DEF0044CA4F /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF2731BE1E7B8DE40044CA4F /* RCTDeviceInfo.h */; }; @@ -1171,6 +1171,7 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + C6827DFC1EF1801B00D66BEF /* RCTJSEnvironment.h in Copy Headers */, 59EB6DC01EBD70130072A5E7 /* RCTUIManagerObserverCoordinator.h in Copy Headers */, 59B1EBCA1EBD47520047B19B /* RCTShadowView+Layout.h in Copy Headers */, 3D0B84271EC0B45400B2BD8E /* RCTLinkingManager.h in Copy Headers */, @@ -1182,7 +1183,6 @@ 3D383D201EBD27AF005632C8 /* RCTBridge+Private.h in Copy Headers */, 3D7BFD351EA8E43F008DFB7A /* RCTDevSettings.h in Copy Headers */, 3D7BFD331EA8E433008DFB7A /* RCTPackagerClient.h in Copy Headers */, - 3D0976D71E9739FB00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */, 3DA981E91E5B0F7F004F2374 /* RCTJSCSamplingProfiler.h in Copy Headers */, 3DA981EA1E5B0F7F004F2374 /* RCTAccessibilityManager.h in Copy Headers */, 3DA981EB1E5B0F7F004F2374 /* RCTAlertManager.h in Copy Headers */, @@ -1391,12 +1391,12 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + C6827DFB1EF1800E00D66BEF /* RCTJSEnvironment.h in Copy Headers */, 59EB6DBF1EBD6FFC0072A5E7 /* RCTUIManagerObserverCoordinator.h in Copy Headers */, 59B1EBC91EBD46250047B19B /* RCTShadowView+Layout.h in Copy Headers */, 3D383D1F1EBD27A8005632C8 /* RCTBridge+Private.h in Copy Headers */, 3D7BFD311EA8E41F008DFB7A /* RCTPackagerClient.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 */, 3D80D9211DF6FA890028D040 /* RCTResizeMode.h in Copy Headers */, @@ -1819,7 +1819,6 @@ 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJSCSamplingProfiler.m; sourceTree = ""; }; 391E86A21C623EC800009732 /* RCTTouchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTouchEvent.m; sourceTree = ""; }; 391E86A31C623EC800009732 /* RCTTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTouchEvent.h; sourceTree = ""; }; - 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTBridge+JavaScriptCore.h"; sourceTree = ""; }; 3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVRemoteHandler.h; sourceTree = ""; }; 3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVRemoteHandler.m; sourceTree = ""; }; 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVNavigationEventEmitter.h; sourceTree = ""; }; @@ -1985,6 +1984,7 @@ C6194AA91EF156280034D062 /* RCTPackagerConnectionBridgeConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerConnectionBridgeConfig.h; sourceTree = ""; }; C6194AAA1EF156280034D062 /* RCTPackagerConnectionBridgeConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerConnectionBridgeConfig.m; sourceTree = ""; }; C6194AAB1EF156280034D062 /* RCTPackagerConnectionConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerConnectionConfig.h; sourceTree = ""; }; + C6827DF51EF17CCC00D66BEF /* RCTJSEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSEnvironment.h; sourceTree = ""; }; CF2731BE1E7B8DE40044CA4F /* RCTDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDeviceInfo.h; sourceTree = ""; }; CF2731BF1E7B8DE40044CA4F /* RCTDeviceInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDeviceInfo.m; sourceTree = ""; }; E3BBC8EB1ADE6F47001BBD81 /* RCTTextDecorationLineType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTextDecorationLineType.h; sourceTree = ""; }; @@ -2522,7 +2522,6 @@ 83CBBA4B1A601E3B00E9B192 /* RCTAssert.m */, 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */, 83CBBA5F1A601EAA00E9B192 /* RCTBridge.m */, - 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */, 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */, 1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */, 13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */, @@ -2549,6 +2548,7 @@ AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */, 135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */, 135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */, + C6827DF51EF17CCC00D66BEF /* RCTJSEnvironment.h */, 008341F51D1DB34400876D9A /* RCTJSStackFrame.h */, 008341F41D1DB34400876D9A /* RCTJSStackFrame.m */, 13A1F71C1A75392D00D3D453 /* RCTKeyCommands.h */, @@ -2688,6 +2688,7 @@ 3D302F261DF828F800D6DDAE /* RCTResizeMode.h in Headers */, 3D302F271DF828F800D6DDAE /* RCTLinkingManager.h in Headers */, 3D7BFD161EA8E351008DFB7A /* RCTPackagerClient.h in Headers */, + C6827DF71EF17CCC00D66BEF /* RCTJSEnvironment.h in Headers */, 3D302F281DF828F800D6DDAE /* RCTNetworking.h in Headers */, 3D302F291DF828F800D6DDAE /* RCTNetworkTask.h in Headers */, 3D7BFD2E1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h in Headers */, @@ -2755,7 +2756,6 @@ 3D302F621DF828F800D6DDAE /* RCTSourceCode.h in Headers */, 3D302F631DF828F800D6DDAE /* RCTStatusBarManager.h in Headers */, 3D302F641DF828F800D6DDAE /* RCTTiming.h in Headers */, - 3D0976D61E9739F000B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */, 3D302F651DF828F800D6DDAE /* RCTUIManager.h in Headers */, 3D302F661DF828F800D6DDAE /* RCTFPSGraph.h in Headers */, 3D302F681DF828F800D6DDAE /* RCTMacros.h in Headers */, @@ -3061,7 +3061,6 @@ 3D80DA721DF820620028D040 /* RCTModalHostViewManager.h in Headers */, 13134C9C1E296B2A00B9F3CB /* RCTCxxModule.h in Headers */, 3D80DA731DF820620028D040 /* RCTNavigator.h in Headers */, - 3D0976D51E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */, 3D80DA741DF820620028D040 /* RCTNavigatorManager.h in Headers */, 3D80DA751DF820620028D040 /* RCTNavItem.h in Headers */, 3D80DA761DF820620028D040 /* RCTNavItemManager.h in Headers */, @@ -3079,6 +3078,7 @@ 3D80DA7F1DF820620028D040 /* RCTScrollView.h in Headers */, 3D80DA801DF820620028D040 /* RCTScrollViewManager.h in Headers */, 3D80DA811DF820620028D040 /* RCTSegmentedControl.h in Headers */, + C6827DF61EF17CCC00D66BEF /* RCTJSEnvironment.h in Headers */, 3D80DA821DF820620028D040 /* RCTSegmentedControlManager.h in Headers */, 3D80DA831DF820620028D040 /* RCTShadowView.h in Headers */, 3D80DA841DF820620028D040 /* RCTSlider.h in Headers */, diff --git a/React/ReactLegacy.xcodeproj/project.pbxproj b/React/ReactLegacy.xcodeproj/project.pbxproj index 148461b44..1240c907a 100644 --- a/React/ReactLegacy.xcodeproj/project.pbxproj +++ b/React/ReactLegacy.xcodeproj/project.pbxproj @@ -166,10 +166,6 @@ 369123E11DDC75850095B341 /* RCTJSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */; }; 391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; }; 3D05745A1DE5FFF500184BB4 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; }; - 3D0976C11E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */; }; - 3D0976C21E9739A100B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */; }; - 3D0976C31E9739AE00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */; }; - 3D0976C41E9739B400B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */; }; 3D1E68DB1CABD13900DD7465 /* RCTDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */; }; 3D302F1C1DF8264000D6DDAE /* JSBundleType.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; }; 3D302F1E1DF8265A00D6DDAE /* JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; }; @@ -760,6 +756,10 @@ C6194AB81EF1569C0034D062 /* RCTPackagerConnectionBridgeConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = C6194AB31EF1569C0034D062 /* RCTPackagerConnectionBridgeConfig.m */; }; C6194AB91EF1569C0034D062 /* RCTPackagerConnectionConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = C6194AB41EF1569C0034D062 /* RCTPackagerConnectionConfig.h */; }; C6194ABA1EF1569C0034D062 /* RCTPackagerConnectionConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = C6194AB41EF1569C0034D062 /* RCTPackagerConnectionConfig.h */; }; + C6827DF91EF17DC100D66BEF /* RCTJSEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = C6827DF81EF17DC100D66BEF /* RCTJSEnvironment.h */; }; + C6827DFA1EF17DC100D66BEF /* RCTJSEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = C6827DF81EF17DC100D66BEF /* RCTJSEnvironment.h */; }; + C6827DFD1EF1803F00D66BEF /* RCTJSEnvironment.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C6827DF81EF17DC100D66BEF /* RCTJSEnvironment.h */; }; + C6827DFE1EF1804600D66BEF /* RCTJSEnvironment.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C6827DF81EF17DC100D66BEF /* RCTJSEnvironment.h */; }; CF85BC321E79EC6B00F1EF3B /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF85BC301E79EC6B00F1EF3B /* RCTDeviceInfo.h */; }; CF85BC331E79EC6B00F1EF3B /* RCTDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CF85BC311E79EC6B00F1EF3B /* RCTDeviceInfo.m */; }; CF85BC341E79EC7A00F1EF3B /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF85BC301E79EC6B00F1EF3B /* RCTDeviceInfo.h */; }; @@ -826,10 +826,10 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + C6827DFE1EF1804600D66BEF /* RCTJSEnvironment.h in Copy Headers */, 598C22DB1EDCBF82009AF445 /* RCTUIManagerObserverCoordinator.h in Copy Headers */, 5954055C1EC03A8E00766D3C /* RCTShadowView+Layout.h in Copy Headers */, 2D7B05391E9D82080032604E /* RCTBridge+Private.h in Copy Headers */, - 3D0976C31E9739AE00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */, 3D6B76D51E83DD3A008FA614 /* RCTDevSettings.h in Copy Headers */, 3D6B76D61E83DD3A008FA614 /* RCTConvert+Transform.h in Copy Headers */, A12E9E211E5DEAFB0029001B /* RCTPackagerClient.h in Copy Headers */, @@ -990,10 +990,10 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + C6827DFD1EF1803F00D66BEF /* RCTJSEnvironment.h in Copy Headers */, 598C22DA1EDCBF61009AF445 /* RCTUIManagerObserverCoordinator.h in Copy Headers */, 5954055B1EC03A7F00766D3C /* RCTShadowView+Layout.h in Copy Headers */, 3D7BFCEB1EA8E23A008DFB7A /* RCTDevSettings.h in Copy Headers */, - 3D0976C41E9739B400B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */, A12E9E1F1E5DEAEF0029001B /* RCTPackagerClient.h in Copy Headers */, 3D80D91F1DF6FA890028D040 /* RCTImageLoader.h in Copy Headers */, 3D80D9201DF6FA890028D040 /* RCTImageStoreManager.h in Copy Headers */, @@ -1309,7 +1309,6 @@ 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJSCSamplingProfiler.m; sourceTree = ""; }; 391E86A21C623EC800009732 /* RCTTouchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTouchEvent.m; sourceTree = ""; }; 391E86A31C623EC800009732 /* RCTTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTouchEvent.h; sourceTree = ""; }; - 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTBridge+JavaScriptCore.h"; sourceTree = ""; }; 3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDisplayLink.h; sourceTree = ""; }; 3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDisplayLink.m; sourceTree = ""; }; 3D1FA07A1DE4F2EA00E03CC6 /* RCTNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworking.h; sourceTree = ""; }; @@ -1420,6 +1419,7 @@ C6194AB21EF1569C0034D062 /* RCTPackagerConnectionBridgeConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerConnectionBridgeConfig.h; sourceTree = ""; }; C6194AB31EF1569C0034D062 /* RCTPackagerConnectionBridgeConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerConnectionBridgeConfig.m; sourceTree = ""; }; C6194AB41EF1569C0034D062 /* RCTPackagerConnectionConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerConnectionConfig.h; sourceTree = ""; }; + C6827DF81EF17DC100D66BEF /* RCTJSEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSEnvironment.h; sourceTree = ""; }; CF85BC301E79EC6B00F1EF3B /* RCTDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDeviceInfo.h; sourceTree = ""; }; CF85BC311E79EC6B00F1EF3B /* RCTDeviceInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDeviceInfo.m; sourceTree = ""; }; E3BBC8EB1ADE6F47001BBD81 /* RCTTextDecorationLineType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTextDecorationLineType.h; sourceTree = ""; }; @@ -1765,7 +1765,6 @@ 14C2CA771B3ACB0400E6CBB2 /* RCTBatchedBridge.mm */, 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */, 83CBBA5F1A601EAA00E9B192 /* RCTBridge.m */, - 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */, 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */, 1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */, 13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */, @@ -1792,6 +1791,7 @@ AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */, 139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */, 139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */, + C6827DF81EF17DC100D66BEF /* RCTJSEnvironment.h */, 008341F51D1DB34400876D9A /* RCTJSStackFrame.h */, 008341F41D1DB34400876D9A /* RCTJSStackFrame.m */, 13A1F71C1A75392D00D3D453 /* RCTKeyCommands.h */, @@ -1923,7 +1923,6 @@ 3D302F3C1DF828F800D6DDAE /* RCTJavaScriptLoader.h in Headers */, C6194ABA1EF1569C0034D062 /* RCTPackagerConnectionConfig.h in Headers */, 3D302F3D1DF828F800D6DDAE /* RCTJSStackFrame.h in Headers */, - 3D0976C21E9739A100B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */, 3D302F3E1DF828F800D6DDAE /* RCTKeyCommands.h in Headers */, 3D302F3F1DF828F800D6DDAE /* RCTLog.h in Headers */, 3D302F401DF828F800D6DDAE /* RCTModuleData.h in Headers */, @@ -1978,6 +1977,7 @@ 3D302F6E1DF828F800D6DDAE /* RCTBorderDrawing.h in Headers */, 3D302F6F1DF828F800D6DDAE /* RCTBorderStyle.h in Headers */, 3D302F701DF828F800D6DDAE /* RCTComponent.h in Headers */, + C6827DFA1EF17DC100D66BEF /* RCTJSEnvironment.h in Headers */, 3D302F711DF828F800D6DDAE /* RCTComponentData.h in Headers */, 3D302F721DF828F800D6DDAE /* RCTConvert+CoreLocation.h in Headers */, 3D302F761DF828F800D6DDAE /* RCTFont.h in Headers */, @@ -2136,7 +2136,6 @@ 3D80DA451DF820620028D040 /* RCTWebSocketObserverProtocol.h in Headers */, 3D80DA481DF820620028D040 /* RCTJSCExecutor.h in Headers */, 3D80DA491DF820620028D040 /* RCTJSCSamplingProfiler.h in Headers */, - 3D0976C11E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */, 3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */, 3D80DA4B1DF820620028D040 /* RCTAlertManager.h in Headers */, 3D80DA4C1DF820620028D040 /* RCTAppState.h in Headers */, @@ -2144,6 +2143,7 @@ 3D80DA4E1DF820620028D040 /* RCTClipboard.h in Headers */, 3D80DA4F1DF820620028D040 /* RCTDevLoadingView.h in Headers */, 3D80DA501DF820620028D040 /* RCTDevMenu.h in Headers */, + C6827DF91EF17DC100D66BEF /* RCTJSEnvironment.h in Headers */, 3D80DA511DF820620028D040 /* RCTEventEmitter.h in Headers */, 3D80DA521DF820620028D040 /* RCTExceptionsManager.h in Headers */, 3D80DA531DF820620028D040 /* RCTI18nManager.h in Headers */,