Browse Source

Restored original pbxproj. Made source compile using both react-native and react-native-macos.

Tom Underhill 4 years ago
parent
commit
20fb4fbe2e
5 changed files with 87 additions and 160 deletions
  1. 24
    0
      ios/RNCWebView.m
  2. 1
    93
      ios/RNCWebView.xcodeproj/project.pbxproj
  3. 4
    0
      ios/RNCWebViewManager.m
  4. 1
    1
      package.json
  5. 57
    66
      yarn.lock

+ 24
- 0
ios/RNCWebView.m View File

@@ -9,7 +9,11 @@
9 9
 #import <React/RCTConvert.h>
10 10
 #import <React/RCTAutoInsetsProtocol.h>
11 11
 #import "RNCWKProcessPoolManager.h"
12
+#if !TARGET_OS_OSX
13
+#import <UIKit/UIKit.h>
14
+#else
12 15
 #import <React/RCTUIKit.h>
16
+#endif // !TARGET_OS_OSX
13 17
 
14 18
 #import "objc/runtime.h"
15 19
 
@@ -80,7 +84,11 @@ static NSDictionary* customCertificatesForHost;
80 84
 
81 85
 @implementation RNCWebView
82 86
 {
87
+#if !TARGET_OS_OSX
88
+  UIColor * _savedBackgroundColor;
89
+#else
83 90
   RCTUIColor * _savedBackgroundColor;
91
+#endif // !TARGET_OS_OSX
84 92
   BOOL _savedHideKeyboardAccessoryView;
85 93
   BOOL _savedKeyboardDisplayRequiresUserAction;
86 94
 
@@ -100,7 +108,11 @@ static NSDictionary* customCertificatesForHost;
100 108
 - (instancetype)initWithFrame:(CGRect)frame
101 109
 {
102 110
   if ((self = [super initWithFrame:frame])) {
111
+    #if !TARGET_OS_OSX
112
+    super.backgroundColor = [UIColor clearColor];
113
+    #else
103 114
     super.backgroundColor = [RCTUIColor clearColor];
115
+    #endif // !TARGET_OS_OSX
104 116
     _bounces = YES;
105 117
     _scrollEnabled = YES;
106 118
     _showsHorizontalScrollIndicator = YES;
@@ -447,7 +459,11 @@ static NSDictionary* customCertificatesForHost;
447 459
     }
448 460
 }
449 461
 
462
+#if !TARGET_OS_OSX
463
+- (void)setBackgroundColor:(UIColor *)backgroundColor
464
+#else
450 465
 - (void)setBackgroundColor:(RCTUIColor *)backgroundColor
466
+#endif // !TARGET_OS_OSX
451 467
 {
452 468
   _savedBackgroundColor = backgroundColor;
453 469
   if (_webView == nil) {
@@ -696,7 +712,11 @@ static NSDictionary* customCertificatesForHost;
696 712
 }
697 713
 #endif // !TARGET_OS_OSX
698 714
 
715
+#if !TARGET_OS_OSX
716
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
717
+#else
699 718
 - (void)scrollViewWillBeginDragging:(RCTUIScrollView *)scrollView
719
+#endif // !TARGET_OS_OSX
700 720
 {
701 721
 #if !TARGET_OS_OSX
702 722
   scrollView.decelerationRate = _decelerationRate;
@@ -711,7 +731,11 @@ static NSDictionary* customCertificatesForHost;
711 731
 #endif // !TARGET_OS_OSX
712 732
 }
713 733
 
734
+#if !TARGET_OS_OSX
735
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
736
+#else
714 737
 - (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView
738
+#endif // !TARGET_OS_OSX
715 739
 {
716 740
   // Don't allow scrolling the scrollView.
717 741
   if (!_scrollEnabled) {

+ 1
- 93
ios/RNCWebView.xcodeproj/project.pbxproj View File

@@ -8,23 +8,11 @@
8 8
 
9 9
 /* Begin PBXBuildFile section */
10 10
 		3515965E21A3C86000623BFA /* RNCWKProcessPoolManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3515965D21A3C86000623BFA /* RNCWKProcessPoolManager.m */; };
11
-		38116A2B23BBECB700ACE311 /* RNCWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E91B351B21446E6C00F9801F /* RNCWebViewManager.m */; };
12
-		38116A2C23BBECB700ACE311 /* RNCWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = E91B351C21446E6C00F9801F /* RNCWebView.m */; };
13
-		38116A2D23BBECB700ACE311 /* RNCWKProcessPoolManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3515965D21A3C86000623BFA /* RNCWKProcessPoolManager.m */; };
14 11
 		E91B351D21446E6C00F9801F /* RNCWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E91B351B21446E6C00F9801F /* RNCWebViewManager.m */; };
15 12
 		E91B351E21446E6C00F9801F /* RNCWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = E91B351C21446E6C00F9801F /* RNCWebView.m */; };
16 13
 /* End PBXBuildFile section */
17 14
 
18 15
 /* Begin PBXCopyFilesBuildPhase section */
19
-		38116A2F23BBECB700ACE311 /* CopyFiles */ = {
20
-			isa = PBXCopyFilesBuildPhase;
21
-			buildActionMask = 2147483647;
22
-			dstPath = "include/$(PRODUCT_NAME)";
23
-			dstSubfolderSpec = 16;
24
-			files = (
25
-			);
26
-			runOnlyForDeploymentPostprocessing = 0;
27
-		};
28 16
 		58B511D91A9E6C8500147676 /* CopyFiles */ = {
29 17
 			isa = PBXCopyFilesBuildPhase;
30 18
 			buildActionMask = 2147483647;
@@ -40,7 +28,6 @@
40 28
 		134814201AA4EA6300B7C361 /* libRNCWebView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNCWebView.a; sourceTree = BUILT_PRODUCTS_DIR; };
41 29
 		3515965D21A3C86000623BFA /* RNCWKProcessPoolManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNCWKProcessPoolManager.m; sourceTree = "<group>"; };
42 30
 		3515965F21A3C87E00623BFA /* RNCWKProcessPoolManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNCWKProcessPoolManager.h; sourceTree = "<group>"; };
43
-		38116A3323BBECB700ACE311 /* libRNCWebView-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRNCWebView-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
44 31
 		E91B351921446E6C00F9801F /* RNCWebViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNCWebViewManager.h; sourceTree = "<group>"; };
45 32
 		E91B351A21446E6C00F9801F /* RNCWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNCWebView.h; sourceTree = "<group>"; };
46 33
 		E91B351B21446E6C00F9801F /* RNCWebViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNCWebViewManager.m; sourceTree = "<group>"; };
@@ -48,13 +35,6 @@
48 35
 /* End PBXFileReference section */
49 36
 
50 37
 /* Begin PBXFrameworksBuildPhase section */
51
-		38116A2E23BBECB700ACE311 /* Frameworks */ = {
52
-			isa = PBXFrameworksBuildPhase;
53
-			buildActionMask = 2147483647;
54
-			files = (
55
-			);
56
-			runOnlyForDeploymentPostprocessing = 0;
57
-		};
58 38
 		58B511D81A9E6C8500147676 /* Frameworks */ = {
59 39
 			isa = PBXFrameworksBuildPhase;
60 40
 			buildActionMask = 2147483647;
@@ -83,30 +63,12 @@
83 63
 				3515965D21A3C86000623BFA /* RNCWKProcessPoolManager.m */,
84 64
 				3515965F21A3C87E00623BFA /* RNCWKProcessPoolManager.h */,
85 65
 				134814211AA4EA7D00B7C361 /* Products */,
86
-				38116A3323BBECB700ACE311 /* libRNCWebView-macOS.a */,
87 66
 			);
88 67
 			sourceTree = "<group>";
89 68
 		};
90 69
 /* End PBXGroup section */
91 70
 
92 71
 /* Begin PBXNativeTarget section */
93
-		38116A2923BBECB700ACE311 /* RNCWebView-macOS */ = {
94
-			isa = PBXNativeTarget;
95
-			buildConfigurationList = 38116A3023BBECB700ACE311 /* Build configuration list for PBXNativeTarget "RNCWebView-macOS" */;
96
-			buildPhases = (
97
-				38116A2A23BBECB700ACE311 /* Sources */,
98
-				38116A2E23BBECB700ACE311 /* Frameworks */,
99
-				38116A2F23BBECB700ACE311 /* CopyFiles */,
100
-			);
101
-			buildRules = (
102
-			);
103
-			dependencies = (
104
-			);
105
-			name = "RNCWebView-macOS";
106
-			productName = RCTDataManager;
107
-			productReference = 38116A3323BBECB700ACE311 /* libRNCWebView-macOS.a */;
108
-			productType = "com.apple.product-type.library.static";
109
-		};
110 72
 		58B511DA1A9E6C8500147676 /* RNCWebView */ = {
111 73
 			isa = PBXNativeTarget;
112 74
 			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNCWebView" */;
@@ -151,22 +113,11 @@
151 113
 			projectRoot = "";
152 114
 			targets = (
153 115
 				58B511DA1A9E6C8500147676 /* RNCWebView */,
154
-				38116A2923BBECB700ACE311 /* RNCWebView-macOS */,
155 116
 			);
156 117
 		};
157 118
 /* End PBXProject section */
158 119
 
159 120
 /* Begin PBXSourcesBuildPhase section */
160
-		38116A2A23BBECB700ACE311 /* Sources */ = {
161
-			isa = PBXSourcesBuildPhase;
162
-			buildActionMask = 2147483647;
163
-			files = (
164
-				38116A2B23BBECB700ACE311 /* RNCWebViewManager.m in Sources */,
165
-				38116A2C23BBECB700ACE311 /* RNCWebView.m in Sources */,
166
-				38116A2D23BBECB700ACE311 /* RNCWKProcessPoolManager.m in Sources */,
167
-			);
168
-			runOnlyForDeploymentPostprocessing = 0;
169
-		};
170 121
 		58B511D71A9E6C8500147676 /* Sources */ = {
171 122
 			isa = PBXSourcesBuildPhase;
172 123
 			buildActionMask = 2147483647;
@@ -180,40 +131,6 @@
180 131
 /* End PBXSourcesBuildPhase section */
181 132
 
182 133
 /* Begin XCBuildConfiguration section */
183
-		38116A3123BBECB700ACE311 /* Debug */ = {
184
-			isa = XCBuildConfiguration;
185
-			buildSettings = {
186
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/**";
187
-				HEADER_SEARCH_PATHS = (
188
-					"$(inherited)",
189
-					"$(SRCROOT)/../node_modules/react-native/React/**",
190
-				);
191
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
192
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
193
-				OTHER_LDFLAGS = "-ObjC";
194
-				PRODUCT_NAME = "$(TARGET_NAME)";
195
-				SDKROOT = macosx;
196
-				SKIP_INSTALL = YES;
197
-			};
198
-			name = Debug;
199
-		};
200
-		38116A3223BBECB700ACE311 /* Release */ = {
201
-			isa = XCBuildConfiguration;
202
-			buildSettings = {
203
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/**";
204
-				HEADER_SEARCH_PATHS = (
205
-					"$(inherited)",
206
-					"$(SRCROOT)/../node_modules/react-native/React/**",
207
-				);
208
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
209
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
210
-				OTHER_LDFLAGS = "-ObjC";
211
-				PRODUCT_NAME = "$(TARGET_NAME)";
212
-				SDKROOT = macosx;
213
-				SKIP_INSTALL = YES;
214
-			};
215
-			name = Release;
216
-		};
217 134
 		58B511ED1A9E6C8500147676 /* Debug */ = {
218 135
 			isa = XCBuildConfiguration;
219 136
 			buildSettings = {
@@ -330,15 +247,6 @@
330 247
 /* End XCBuildConfiguration section */
331 248
 
332 249
 /* Begin XCConfigurationList section */
333
-		38116A3023BBECB700ACE311 /* Build configuration list for PBXNativeTarget "RNCWebView-macOS" */ = {
334
-			isa = XCConfigurationList;
335
-			buildConfigurations = (
336
-				38116A3123BBECB700ACE311 /* Debug */,
337
-				38116A3223BBECB700ACE311 /* Release */,
338
-			);
339
-			defaultConfigurationIsVisible = 0;
340
-			defaultConfigurationName = Release;
341
-		};
342 250
 		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNCWebView" */ = {
343 251
 			isa = XCConfigurationList;
344 252
 			buildConfigurations = (
@@ -360,4 +268,4 @@
360 268
 /* End XCConfigurationList section */
361 269
 	};
362 270
 	rootObject = 58B511D31A9E6C8500147676 /* Project object */;
363
-}
271
+}

+ 4
- 0
ios/RNCWebViewManager.m View File

@@ -22,7 +22,11 @@
22 22
 
23 23
 RCT_EXPORT_MODULE()
24 24
 
25
+#if !TARGET_OS_OSX
26
+- (UIView *)view
27
+#else
25 28
 - (RCTUIView *)view
29
+#endif // !TARGET_OS_OSX
26 30
 {
27 31
   RNCWebView *webView = [RNCWebView new];
28 32
   webView.delegate = self;

+ 1
- 1
package.json View File

@@ -59,7 +59,7 @@
59 59
     "metro-react-native-babel-preset": "0.54.1",
60 60
     "react": "16.9.0",
61 61
     "react-native": "0.61.5",
62
-    "react-native-macos": "git://github.com/microsoft/react-native",
62
+    "react-native-macos": "git://github.com/microsoft/react-native#v0.60.0-microsoft.40",
63 63
     "semantic-release": "15.13.24",
64 64
     "typescript": "3.6.2"
65 65
   },

+ 57
- 66
yarn.lock View File

@@ -1047,7 +1047,7 @@
1047 1047
   resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.9.0.tgz#28831e61ce565a2c7d1905852fce1eecfd33cb5e"
1048 1048
   integrity sha512-VEQs4Q6R5tnlYFrQIFoPEWjLc43whRHC9HeH+idbFymwDqysLVUffQbb9D6PJUj+C/AvrDhBhU6S3tDjGbSsag==
1049 1049
   dependencies:
1050
-    "@react-native-community/cli-tools" "^3.0.0"
1050
+    "@react-native-community/cli-tools" "^2.8.3"
1051 1051
     chalk "^2.4.2"
1052 1052
     execa "^1.0.0"
1053 1053
     jetifier "^1.6.2"
@@ -1073,9 +1073,8 @@
1073 1073
   resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.10.0.tgz#ee494d2f9a8f8727bd5eb3c446f22ebb5429b624"
1074 1074
   integrity sha512-z5BQKyT/bgTSdHhvsFNf++6VP50vtOOaITnNKvw4954wURjv5JOQh1De3BngyaDOoGfV1mXkCxutqAXqSeuIjw==
1075 1075
   dependencies:
1076
-    "@react-native-community/cli-tools" "^3.0.0"
1076
+    "@react-native-community/cli-tools" "^2.8.3"
1077 1077
     chalk "^2.4.2"
1078
-    js-yaml "^3.13.1"
1079 1078
     xcode "^2.0.0"
1080 1079
 
1081 1080
 "@react-native-community/cli-platform-ios@^3.0.0":
@@ -1123,7 +1122,6 @@
1123 1122
     "@react-native-community/cli-platform-ios" "^2.10.0"
1124 1123
     "@react-native-community/cli-tools" "^2.8.3"
1125 1124
     chalk "^2.4.2"
1126
-    command-exists "^1.2.8"
1127 1125
     commander "^2.19.0"
1128 1126
     compression "^1.7.1"
1129 1127
     connect "^3.6.5"
@@ -1132,16 +1130,15 @@
1132 1130
     envinfo "^7.1.0"
1133 1131
     errorhandler "^1.5.0"
1134 1132
     execa "^1.0.0"
1135
-    find-up "^4.1.0"
1136 1133
     fs-extra "^7.0.1"
1137 1134
     glob "^7.1.1"
1138 1135
     graceful-fs "^4.1.3"
1139 1136
     inquirer "^3.0.6"
1140 1137
     lodash "^4.17.5"
1141
-    metro "^0.56.0"
1142
-    metro-config "^0.56.0"
1143
-    metro-core "^0.56.0"
1144
-    metro-react-native-babel-transformer "^0.56.0"
1138
+    metro "^0.54.1"
1139
+    metro-config "^0.54.1"
1140
+    metro-core "^0.54.1"
1141
+    metro-react-native-babel-transformer "^0.54.1"
1145 1142
     minimist "^1.2.0"
1146 1143
     mkdirp "^0.5.1"
1147 1144
     morgan "^1.9.0"
@@ -1149,12 +1146,9 @@
1149 1146
     open "^6.2.0"
1150 1147
     ora "^3.4.0"
1151 1148
     plist "^3.0.0"
1152
-    semver "^6.3.0"
1149
+    semver "^5.0.3"
1153 1150
     serve-static "^1.13.1"
1154 1151
     shell-quote "1.6.1"
1155
-    strip-ansi "^5.2.0"
1156
-    sudo-prompt "^9.0.0"
1157
-    wcwidth "^1.0.1"
1158 1152
     ws "^1.1.0"
1159 1153
 
1160 1154
 "@react-native-community/cli@^3.0.0":
@@ -5991,10 +5985,10 @@ merge2@^1.2.3:
5991 5985
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
5992 5986
   integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==
5993 5987
 
5994
-metro-babel-register@^0.56.0, metro-babel-register@^0.56.4:
5995
-  version "0.56.4"
5996
-  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.56.4.tgz#b0c627a1cfdd1bdd768f81af79481754e833a902"
5997
-  integrity sha512-Phm6hMluOWYqfykftjJ1jsTpWvbgb49AC/1taxEctxUdRCZlFgZwBleJZAhQYxJD5J+ikFkEbHDzePEXb29KVA==
5988
+metro-babel-register@0.54.1:
5989
+  version "0.54.1"
5990
+  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.54.1.tgz#7d2bfe444b1ccef8de99aedc7d9330891d806076"
5991
+  integrity sha512-j3VydgncUG8HP6AZala6GTIt3V01nptodnnOke3JMYLqgk8EJ1LOVOdotK9pXi80o7EmmNKFs/LyyH8z+uAJzQ==
5998 5992
   dependencies:
5999 5993
     "@babel/core" "^7.0.0"
6000 5994
     "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -6049,13 +6043,13 @@ metro-babel7-plugin-react-transform@0.54.1:
6049 6043
   dependencies:
6050 6044
     "@babel/helper-module-imports" "^7.0.0"
6051 6045
 
6052
-metro-cache@^0.56.4:
6053
-  version "0.56.4"
6054
-  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.56.4.tgz#542f9f8a35f8fb9d5576f46fd3ab4d4f42851a7e"
6055
-  integrity sha512-d1hiUSKwtRsuMxUhHVJ3tjK2BbpUlJGvTyMWohK8Wxx+0GbnWRWWFcI4vlCzlZfoK0VtZK2MJEl5t7Du1mIniQ==
6046
+metro-cache@0.54.1:
6047
+  version "0.54.1"
6048
+  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.54.1.tgz#2e9017cbd11106837b8c385c9eb8c8175469a8c1"
6049
+  integrity sha512-RxCFoNcANHXZYi4MIQNnqh68gUnC3bMpzCFJY5pBoqqdrkkn8ibYglBweA0/DW7hx1OZTJWelwS1Dp8xxmE2CA==
6056 6050
   dependencies:
6057 6051
     jest-serializer "^24.4.0"
6058
-    metro-core "^0.56.4"
6052
+    metro-core "0.54.1"
6059 6053
     mkdirp "^0.5.1"
6060 6054
     rimraf "^2.5.4"
6061 6055
 
@@ -6076,9 +6070,9 @@ metro-config@0.54.1, metro-config@^0.54.1:
6076 6070
   dependencies:
6077 6071
     cosmiconfig "^5.0.5"
6078 6072
     jest-validate "^24.7.0"
6079
-    metro "^0.56.4"
6080
-    metro-cache "^0.56.4"
6081
-    metro-core "^0.56.4"
6073
+    metro "0.54.1"
6074
+    metro-cache "0.54.1"
6075
+    metro-core "0.54.1"
6082 6076
     pretty-format "^24.7.0"
6083 6077
 
6084 6078
 metro-config@^0.56.0, metro-config@^0.56.4:
@@ -6100,7 +6094,7 @@ metro-core@0.54.1, metro-core@^0.54.1:
6100 6094
   dependencies:
6101 6095
     jest-haste-map "^24.7.1"
6102 6096
     lodash.throttle "^4.1.1"
6103
-    metro-resolver "^0.56.4"
6097
+    metro-resolver "0.54.1"
6104 6098
     wordwrap "^1.0.0"
6105 6099
 
6106 6100
 metro-core@^0.56.0, metro-core@^0.56.4:
@@ -6232,16 +6226,15 @@ metro-react-native-babel-preset@^0.56.4:
6232 6226
     "@babel/template" "^7.0.0"
6233 6227
     react-refresh "^0.4.0"
6234 6228
 
6235
-metro-react-native-babel-transformer@^0.56.0:
6236
-  version "0.56.4"
6237
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.56.4.tgz#3c6e48b605c305362ee624e45ff338656e35fc1d"
6238
-  integrity sha512-ng74eutuy1nyGI9+TDzzVAVfEmNPDlapV4msTQMKPi4EFqo/fBn7Ct33ME9l5E51pQBBnxt/UwcpTvd13b29kQ==
6229
+metro-react-native-babel-transformer@0.54.1, metro-react-native-babel-transformer@^0.54.1:
6230
+  version "0.54.1"
6231
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.54.1.tgz#45b56db004421134e10e739f69e8de50775fef17"
6232
+  integrity sha512-ECw7xG91t8dk/PHdiyoC5SP1s9OQzfmJzG5m0YOZaKtHMe534qTDbncxaKfTI3CP99yti2maXFBRVj+xyvph/g==
6239 6233
   dependencies:
6240 6234
     "@babel/core" "^7.0.0"
6241 6235
     babel-preset-fbjs "^3.1.2"
6242
-    metro-babel-transformer "^0.56.4"
6243
-    metro-react-native-babel-preset "^0.56.4"
6244
-    metro-source-map "^0.56.4"
6236
+    metro-babel-transformer "0.54.1"
6237
+    metro-react-native-babel-preset "0.54.1"
6245 6238
 
6246 6239
 metro-react-native-babel-transformer@^0.56.0:
6247 6240
   version "0.56.4"
@@ -6285,8 +6278,8 @@ metro-source-map@0.55.0, metro-source-map@^0.55.0:
6285 6278
     "@babel/traverse" "^7.0.0"
6286 6279
     "@babel/types" "^7.0.0"
6287 6280
     invariant "^2.2.4"
6288
-    metro-symbolicate "^0.56.4"
6289
-    ob1 "^0.56.4"
6281
+    metro-symbolicate "0.55.0"
6282
+    ob1 "0.55.0"
6290 6283
     source-map "^0.5.6"
6291 6284
     vlq "^1.0.0"
6292 6285
 
@@ -6308,8 +6301,7 @@ metro-symbolicate@0.55.0:
6308 6301
   resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.55.0.tgz#4086a2adae54b5e44a4911ca572d8a7b03c71fa1"
6309 6302
   integrity sha512-3r3Gpv5L4U7rBGpIqw5S1nun5MelfUMLRiScJsPRGZVTX3WY1w+zpaQKlWBi5yuHf5dMQ+ZUVbhb02IdrfJ2Fg==
6310 6303
   dependencies:
6311
-    invariant "^2.2.4"
6312
-    metro-source-map "^0.56.4"
6304
+    metro-source-map "0.55.0"
6313 6305
     source-map "^0.5.6"
6314 6306
     through2 "^2.0.1"
6315 6307
     vlq "^1.0.0"
@@ -6357,21 +6349,21 @@ metro@0.54.1, metro@^0.54.1:
6357 6349
     json-stable-stringify "^1.0.1"
6358 6350
     lodash.throttle "^4.1.1"
6359 6351
     merge-stream "^1.0.1"
6360
-    metro-babel-register "^0.56.4"
6361
-    metro-babel-transformer "^0.56.4"
6362
-    metro-cache "^0.56.4"
6363
-    metro-config "^0.56.4"
6364
-    metro-core "^0.56.4"
6365
-    metro-inspector-proxy "^0.56.4"
6366
-    metro-minify-uglify "^0.56.4"
6367
-    metro-react-native-babel-preset "^0.56.4"
6368
-    metro-resolver "^0.56.4"
6369
-    metro-source-map "^0.56.4"
6370
-    metro-symbolicate "^0.56.4"
6352
+    metro-babel-register "0.54.1"
6353
+    metro-babel-transformer "0.54.1"
6354
+    metro-cache "0.54.1"
6355
+    metro-config "0.54.1"
6356
+    metro-core "0.54.1"
6357
+    metro-inspector-proxy "0.54.1"
6358
+    metro-minify-uglify "0.54.1"
6359
+    metro-react-native-babel-preset "0.54.1"
6360
+    metro-resolver "0.54.1"
6361
+    metro-source-map "0.54.1"
6371 6362
     mime-types "2.1.11"
6372 6363
     mkdirp "^0.5.1"
6373 6364
     node-fetch "^2.2.0"
6374 6365
     nullthrows "^1.1.0"
6366
+    react-transform-hmr "^1.0.4"
6375 6367
     resolve "^1.5.0"
6376 6368
     rimraf "^2.5.4"
6377 6369
     serialize-error "^2.1.0"
@@ -7106,10 +7098,10 @@ oauth-sign@~0.9.0:
7106 7098
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
7107 7099
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
7108 7100
 
7109
-ob1@^0.56.4:
7110
-  version "0.56.4"
7111
-  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.56.4.tgz#c4acb3baa42f4993a44b35b2da7c8ef443dcccec"
7112
-  integrity sha512-URgFof9z2wotiYFsqlydXtQfGV81gvBI2ODy64xfd3vPo+AYom5PVDX4t4zn23t/O+S2IxqApSQM8uJAybmz7w==
7101
+ob1@0.55.0:
7102
+  version "0.55.0"
7103
+  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.55.0.tgz#e393b4ae786ef442b3ef2a298ab70d6ec353dbdd"
7104
+  integrity sha512-pfyiMVsUItl8WiRKMT15eCi662pCRAuYTq2+V3UpE+PpFErJI/TvRh/M/l/9TaLlbFr7krJ7gdl+FXJNcybmvw==
7113 7105
 
7114 7106
 ob1@^0.56.4:
7115 7107
   version "0.56.4"
@@ -7915,14 +7907,14 @@ react-is@^16.8.1, react-is@^16.8.4:
7915 7907
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
7916 7908
   integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
7917 7909
 
7918
-"react-native-macos@git://github.com/microsoft/react-native":
7919
-  version "0.60.0-microsoft.38"
7920
-  resolved "git://github.com/microsoft/react-native#dca14b8ded1694f5a5b267ff94f520482fcf1c15"
7910
+"react-native-macos@git://github.com/microsoft/react-native#v0.60.0-microsoft.40":
7911
+  version "0.60.0-microsoft.40"
7912
+  resolved "git://github.com/microsoft/react-native#495ca4dfdfce10dd9d5c3a53fd6afd4f1df9aeb8"
7921 7913
   dependencies:
7922 7914
     "@babel/runtime" "^7.0.0"
7923
-    "@react-native-community/cli" "^3.0.0"
7924
-    "@react-native-community/cli-platform-android" "^3.0.0"
7925
-    "@react-native-community/cli-platform-ios" "^3.0.0"
7915
+    "@react-native-community/cli" "^2.6.0"
7916
+    "@react-native-community/cli-platform-android" "^2.6.0"
7917
+    "@react-native-community/cli-platform-ios" "^2.4.1"
7926 7918
     abort-controller "^3.0.0"
7927 7919
     art "^0.10.0"
7928 7920
     base64-js "^1.1.2"
@@ -7932,20 +7924,19 @@ react-is@^16.8.1, react-is@^16.8.4:
7932 7924
     event-target-shim "^5.0.1"
7933 7925
     fbjs "^1.0.0"
7934 7926
     fbjs-scripts "^1.1.0"
7935
-    hermes-engine "^0.2.1"
7927
+    hermesvm "^0.1.0"
7936 7928
     invariant "^2.2.4"
7937
-    jsc-android "^245459.0.0"
7938
-    metro-babel-register "^0.56.0"
7939
-    metro-react-native-babel-transformer "^0.56.0"
7940
-    metro-source-map "^0.56.0"
7929
+    jsc-android "245459.0.0"
7930
+    metro-babel-register "0.54.1"
7931
+    metro-react-native-babel-transformer "0.54.1"
7932
+    metro-source-map "^0.55.0"
7941 7933
     nullthrows "^1.1.0"
7942 7934
     pretty-format "^24.7.0"
7943 7935
     promise "^7.1.1"
7944 7936
     prop-types "^15.7.2"
7945
-    react-devtools-core "^3.6.3"
7946
-    react-refresh "^0.4.0"
7937
+    react-devtools-core "^3.6.1"
7947 7938
     regenerator-runtime "^0.13.2"
7948
-    scheduler "0.15.0"
7939
+    scheduler "0.14.0"
7949 7940
     stacktrace-parser "^0.1.3"
7950 7941
     whatwg-fetch "^3.0.0"
7951 7942