Browse Source

use npm instead of yarn; upgrade rn version to 0.55.3 for demo; bump version to 0.6.1

iou90 6 years ago
parent
commit
28ff2f862d

+ 1
- 1
demo/.flowconfig View File

@@ -51,4 +51,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
51 51
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
52 52
 
53 53
 [version]
54
-^0.65.0
54
+^0.67.0

+ 3
- 0
demo/.gitignore View File

@@ -51,3 +51,6 @@ buck-out/
51 51
 */fastlane/report.xml
52 52
 */fastlane/Preview.html
53 53
 */fastlane/screenshots
54
+
55
+# Bundle artifact
56
+*.jsbundle

+ 1
- 1
demo/android/app/src/main/AndroidManifest.xml View File

@@ -8,7 +8,7 @@
8 8
       android:name=".MainApplication"
9 9
       android:label="@string/app_name"
10 10
       android:icon="@mipmap/ic_launcher"
11
-      android:allowBackup="false"
11
+      android:allowBackup="true"
12 12
       android:theme="@style/AppTheme">
13 13
       <activity
14 14
         android:name=".MainActivity"

+ 117
- 0
demo/ios/demo.xcodeproj/project.pbxproj View File

@@ -34,7 +34,11 @@
34 34
 		2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; };
35 35
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
36 36
 		2DCD954D1E0B4F2C00145EB5 /* demoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* demoTests.m */; };
37
+<<<<<<< ours
37 38
 		4015A12E66A247F0B2F6AE09 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6205ED3CE4F403ABCC50D34 /* libRCTActionSheet.a */; };
39
+=======
40
+		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
41
+>>>>>>> theirs
38 42
 		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
39 43
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
40 44
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
@@ -132,56 +136,88 @@
132 136
 			remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
133 137
 			remoteInfo = "fishhook-tvOS";
134 138
 		};
139
+<<<<<<< ours
135 140
 		376DEA652043F3BD000FE890 /* PBXContainerItemProxy */ = {
141
+=======
142
+		2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */ = {
143
+>>>>>>> theirs
136 144
 			isa = PBXContainerItemProxy;
137 145
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
138 146
 			proxyType = 2;
139 147
 			remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
140 148
 			remoteInfo = jsinspector;
141 149
 		};
150
+<<<<<<< ours
142 151
 		376DEA672043F3BD000FE890 /* PBXContainerItemProxy */ = {
152
+=======
153
+		2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */ = {
154
+>>>>>>> theirs
143 155
 			isa = PBXContainerItemProxy;
144 156
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
145 157
 			proxyType = 2;
146 158
 			remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
147 159
 			remoteInfo = "jsinspector-tvOS";
148 160
 		};
161
+<<<<<<< ours
149 162
 		376DEA692043F3BD000FE890 /* PBXContainerItemProxy */ = {
163
+=======
164
+		2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */ = {
165
+>>>>>>> theirs
150 166
 			isa = PBXContainerItemProxy;
151 167
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
152 168
 			proxyType = 2;
153 169
 			remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
154 170
 			remoteInfo = "third-party";
155 171
 		};
172
+<<<<<<< ours
156 173
 		376DEA6B2043F3BD000FE890 /* PBXContainerItemProxy */ = {
174
+=======
175
+		2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */ = {
176
+>>>>>>> theirs
157 177
 			isa = PBXContainerItemProxy;
158 178
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
159 179
 			proxyType = 2;
160 180
 			remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
161 181
 			remoteInfo = "third-party-tvOS";
162 182
 		};
183
+<<<<<<< ours
163 184
 		376DEA6D2043F3BD000FE890 /* PBXContainerItemProxy */ = {
185
+=======
186
+		2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */ = {
187
+>>>>>>> theirs
164 188
 			isa = PBXContainerItemProxy;
165 189
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
166 190
 			proxyType = 2;
167 191
 			remoteGlobalIDString = 139D7E881E25C6D100323FB7;
168 192
 			remoteInfo = "double-conversion";
169 193
 		};
194
+<<<<<<< ours
170 195
 		376DEA6F2043F3BD000FE890 /* PBXContainerItemProxy */ = {
196
+=======
197
+		2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */ = {
198
+>>>>>>> theirs
171 199
 			isa = PBXContainerItemProxy;
172 200
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
173 201
 			proxyType = 2;
174 202
 			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
175 203
 			remoteInfo = "double-conversion-tvOS";
176 204
 		};
205
+<<<<<<< ours
177 206
 		376DEA712043F3BD000FE890 /* PBXContainerItemProxy */ = {
207
+=======
208
+		2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = {
209
+>>>>>>> theirs
178 210
 			isa = PBXContainerItemProxy;
179 211
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
180 212
 			proxyType = 2;
181 213
 			remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
182 214
 			remoteInfo = privatedata;
183 215
 		};
216
+<<<<<<< ours
184 217
 		376DEA732043F3BD000FE890 /* PBXContainerItemProxy */ = {
218
+=======
219
+		2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = {
220
+>>>>>>> theirs
185 221
 			isa = PBXContainerItemProxy;
186 222
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
187 223
 			proxyType = 2;
@@ -396,6 +432,7 @@
396 432
 			isa = PBXFrameworksBuildPhase;
397 433
 			buildActionMask = 2147483647;
398 434
 			files = (
435
+				2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */,
399 436
 			);
400 437
 			runOnlyForDeploymentPostprocessing = 0;
401 438
 		};
@@ -506,6 +543,7 @@
506 543
 				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
507 544
 				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
508 545
 				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
546
+<<<<<<< ours
509 547
 				376DEA662043F3BD000FE890 /* libjsinspector.a */,
510 548
 				376DEA682043F3BD000FE890 /* libjsinspector-tvOS.a */,
511 549
 				376DEA6A2043F3BD000FE890 /* libthird-party.a */,
@@ -514,6 +552,16 @@
514 552
 				376DEA702043F3BD000FE890 /* libdouble-conversion.a */,
515 553
 				376DEA722043F3BD000FE890 /* libprivatedata.a */,
516 554
 				376DEA742043F3BD000FE890 /* libprivatedata-tvOS.a */,
555
+=======
556
+				2DF0FFDF2056DD460020B375 /* libjsinspector.a */,
557
+				2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */,
558
+				2DF0FFE32056DD460020B375 /* libthird-party.a */,
559
+				2DF0FFE52056DD460020B375 /* libthird-party.a */,
560
+				2DF0FFE72056DD460020B375 /* libdouble-conversion.a */,
561
+				2DF0FFE92056DD460020B375 /* libdouble-conversion.a */,
562
+				2DF0FFEB2056DD460020B375 /* libprivatedata.a */,
563
+				2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */,
564
+>>>>>>> theirs
517 565
 			);
518 566
 			name = Products;
519 567
 			sourceTree = "<group>";
@@ -864,6 +912,7 @@
864 912
 			remoteRef = 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */;
865 913
 			sourceTree = BUILT_PRODUCTS_DIR;
866 914
 		};
915
+<<<<<<< ours
867 916
 		376DEA662043F3BD000FE890 /* libjsinspector.a */ = {
868 917
 			isa = PBXReferenceProxy;
869 918
 			fileType = archive.ar;
@@ -918,6 +967,62 @@
918 967
 			fileType = archive.ar;
919 968
 			path = "libprivatedata-tvOS.a";
920 969
 			remoteRef = 376DEA732043F3BD000FE890 /* PBXContainerItemProxy */;
970
+=======
971
+		2DF0FFDF2056DD460020B375 /* libjsinspector.a */ = {
972
+			isa = PBXReferenceProxy;
973
+			fileType = archive.ar;
974
+			path = libjsinspector.a;
975
+			remoteRef = 2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */;
976
+			sourceTree = BUILT_PRODUCTS_DIR;
977
+		};
978
+		2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */ = {
979
+			isa = PBXReferenceProxy;
980
+			fileType = archive.ar;
981
+			path = "libjsinspector-tvOS.a";
982
+			remoteRef = 2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */;
983
+			sourceTree = BUILT_PRODUCTS_DIR;
984
+		};
985
+		2DF0FFE32056DD460020B375 /* libthird-party.a */ = {
986
+			isa = PBXReferenceProxy;
987
+			fileType = archive.ar;
988
+			path = "libthird-party.a";
989
+			remoteRef = 2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */;
990
+			sourceTree = BUILT_PRODUCTS_DIR;
991
+		};
992
+		2DF0FFE52056DD460020B375 /* libthird-party.a */ = {
993
+			isa = PBXReferenceProxy;
994
+			fileType = archive.ar;
995
+			path = "libthird-party.a";
996
+			remoteRef = 2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */;
997
+			sourceTree = BUILT_PRODUCTS_DIR;
998
+		};
999
+		2DF0FFE72056DD460020B375 /* libdouble-conversion.a */ = {
1000
+			isa = PBXReferenceProxy;
1001
+			fileType = archive.ar;
1002
+			path = "libdouble-conversion.a";
1003
+			remoteRef = 2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */;
1004
+			sourceTree = BUILT_PRODUCTS_DIR;
1005
+		};
1006
+		2DF0FFE92056DD460020B375 /* libdouble-conversion.a */ = {
1007
+			isa = PBXReferenceProxy;
1008
+			fileType = archive.ar;
1009
+			path = "libdouble-conversion.a";
1010
+			remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */;
1011
+			sourceTree = BUILT_PRODUCTS_DIR;
1012
+		};
1013
+		2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = {
1014
+			isa = PBXReferenceProxy;
1015
+			fileType = archive.ar;
1016
+			path = libprivatedata.a;
1017
+			remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */;
1018
+			sourceTree = BUILT_PRODUCTS_DIR;
1019
+		};
1020
+		2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = {
1021
+			isa = PBXReferenceProxy;
1022
+			fileType = archive.ar;
1023
+			path = "libprivatedata-tvOS.a";
1024
+			remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */;
1025
+>>>>>>> theirs
921 1026
 			sourceTree = BUILT_PRODUCTS_DIR;
922 1027
 		};
923 1028
 		3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
@@ -1353,9 +1458,15 @@
1353 1458
 				GCC_NO_COMMON_BLOCKS = YES;
1354 1459
 				INFOPLIST_FILE = "demo-tvOSTests/Info.plist";
1355 1460
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1461
+<<<<<<< ours
1356 1462
 				LIBRARY_SEARCH_PATHS = (
1357 1463
 					"$(inherited)",
1358 1464
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1465
+=======
1466
+				OTHER_LDFLAGS = (
1467
+					"-ObjC",
1468
+					"-lc++",
1469
+>>>>>>> theirs
1359 1470
 				);
1360 1471
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.demo-tvOSTests";
1361 1472
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1378,9 +1489,15 @@
1378 1489
 				GCC_NO_COMMON_BLOCKS = YES;
1379 1490
 				INFOPLIST_FILE = "demo-tvOSTests/Info.plist";
1380 1491
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1492
+<<<<<<< ours
1381 1493
 				LIBRARY_SEARCH_PATHS = (
1382 1494
 					"$(inherited)",
1383 1495
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1496
+=======
1497
+				OTHER_LDFLAGS = (
1498
+					"-ObjC",
1499
+					"-lc++",
1500
+>>>>>>> theirs
1384 1501
 				);
1385 1502
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.demo-tvOSTests";
1386 1503
 				PRODUCT_NAME = "$(TARGET_NAME)";

+ 2
- 4
demo/ios/demo/AppDelegate.h View File

@@ -1,10 +1,8 @@
1 1
 /**
2 2
  * Copyright (c) 2015-present, Facebook, Inc.
3
- * All rights reserved.
4 3
  *
5
- * This source code is licensed under the BSD-style license found in the
6
- * LICENSE file in the root directory of this source tree. An additional grant
7
- * of patent rights can be found in the PATENTS file in the same directory.
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE file in the root directory of this source tree.
8 6
  */
9 7
 
10 8
 #import <UIKit/UIKit.h>

+ 2
- 4
demo/ios/demo/AppDelegate.m View File

@@ -1,10 +1,8 @@
1 1
 /**
2 2
  * Copyright (c) 2015-present, Facebook, Inc.
3
- * All rights reserved.
4 3
  *
5
- * This source code is licensed under the BSD-style license found in the
6
- * LICENSE file in the root directory of this source tree. An additional grant
7
- * of patent rights can be found in the PATENTS file in the same directory.
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE file in the root directory of this source tree.
8 6
  */
9 7
 
10 8
 #import "AppDelegate.h"

+ 2
- 4
demo/ios/demo/main.m View File

@@ -1,10 +1,8 @@
1 1
 /**
2 2
  * Copyright (c) 2015-present, Facebook, Inc.
3
- * All rights reserved.
4 3
  *
5
- * This source code is licensed under the BSD-style license found in the
6
- * LICENSE file in the root directory of this source tree. An additional grant
7
- * of patent rights can be found in the PATENTS file in the same directory.
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE file in the root directory of this source tree.
8 6
  */
9 7
 
10 8
 #import <UIKit/UIKit.h>

+ 2
- 4
demo/ios/demoTests/demoTests.m View File

@@ -1,10 +1,8 @@
1 1
 /**
2 2
  * Copyright (c) 2015-present, Facebook, Inc.
3
- * All rights reserved.
4 3
  *
5
- * This source code is licensed under the BSD-style license found in the
6
- * LICENSE file in the root directory of this source tree. An additional grant
7
- * of patent rights can be found in the PATENTS file in the same directory.
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE file in the root directory of this source tree.
8 6
  */
9 7
 
10 8
 #import <UIKit/UIKit.h>

+ 717
- 804
demo/package-lock.json
File diff suppressed because it is too large
View File


+ 2
- 2
demo/package.json View File

@@ -7,8 +7,8 @@
7 7
     "test": "jest"
8 8
   },
9 9
   "dependencies": {
10
-    "react": "^16.3.0-alpha.1",
11
-    "react-native": "0.54.3",
10
+    "react": "^16.3.1",
11
+    "react-native": "^0.55.3",
12 12
     "react-native-autoheight-webview": "../"
13 13
   },
14 14
   "devDependencies": {

+ 1633
- 0
package-lock.json
File diff suppressed because it is too large
View File


+ 1
- 1
package.json View File

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "name": "react-native-autoheight-webview",
3
-  "version": "0.6.0",
3
+  "version": "0.6.1",
4 4
   "description": "An auto height webview for React Native",
5 5
   "main": "autoHeightWebView",
6 6
   "files": [

+ 0
- 1163
yarn.lock
File diff suppressed because it is too large
View File