Daniel Zlotin 7 anni fa
parent
commit
a5a07cf98b
4 ha cambiato i file con 146 aggiunte e 48 eliminazioni
  1. 7
    0
      ios/RNNBridgeModule.h
  2. 17
    0
      ios/RNNBridgeModule.m
  3. 40
    26
      ios/ReactNativeNavigation.xcodeproj/project.pbxproj
  4. 82
    22
      yarn.lock

+ 7
- 0
ios/RNNBridgeModule.h Vedi File

@@ -0,0 +1,7 @@
1
+#import <Foundation/Foundation.h>
2
+#import "RCTBridgeModule.h"
3
+#import <UIKit/UIKit.h>
4
+
5
+@interface RNNBridgeModule : NSObject <RCTBridgeModule>
6
+
7
+@end

+ 17
- 0
ios/RNNBridgeModule.m Vedi File

@@ -0,0 +1,17 @@
1
+#import "RNNBridgeModule.h"
2
+
3
+@implementation RNNBridgeModule
4
+
5
+RCT_EXPORT_MODULE(NativeNavigation);
6
+
7
+- (dispatch_queue_t)methodQueue
8
+{
9
+    return dispatch_get_main_queue();
10
+}
11
+
12
+RCT_EXPORT_METHOD(startApp:(NSDictionary*)layout)
13
+{
14
+    
15
+}
16
+
17
+@end

+ 40
- 26
ios/ReactNativeNavigation.xcodeproj/project.pbxproj Vedi File

@@ -13,6 +13,7 @@
13 13
 		2636176F1E12722900D88A13 /* RNNTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2636176E1E12722900D88A13 /* RNNTabBarController.m */; };
14 14
 		2636F1611E0EC9E7007ABB09 /* RNNStyler.m in Sources */ = {isa = PBXBuildFile; fileRef = 2636F1601E0EC9E7007ABB09 /* RNNStyler.m */; };
15 15
 		26AFF3F51D7EEE2400CBA211 /* RCCTitleViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 26AFF3F41D7EEE2400CBA211 /* RCCTitleViewHelper.m */; };
16
+		7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */; };
16 17
 		CC84A19E1C1A0C4E00B3A6A2 /* RCCManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CC84A1941C1A0C4E00B3A6A2 /* RCCManager.m */; };
17 18
 		CC84A19F1C1A0C4E00B3A6A2 /* RCCManagerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = CC84A1961C1A0C4E00B3A6A2 /* RCCManagerModule.m */; };
18 19
 		CC84A1A01C1A0C4E00B3A6A2 /* RCCNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC84A1981C1A0C4E00B3A6A2 /* RCCNavigationController.m */; };
@@ -64,6 +65,8 @@
64 65
 		2636F1601E0EC9E7007ABB09 /* RNNStyler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNStyler.m; sourceTree = "<group>"; };
65 66
 		26AFF3F31D7EEE2400CBA211 /* RCCTitleViewHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCTitleViewHelper.h; sourceTree = "<group>"; };
66 67
 		26AFF3F41D7EEE2400CBA211 /* RCCTitleViewHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCCTitleViewHelper.m; sourceTree = "<group>"; };
68
+		7BBFE5421E25330E002A6182 /* RNNBridgeModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNBridgeModule.h; sourceTree = "<group>"; };
69
+		7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNBridgeModule.m; sourceTree = "<group>"; };
67 70
 		CC84A1931C1A0C4E00B3A6A2 /* RCCManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCManager.h; sourceTree = "<group>"; };
68 71
 		CC84A1941C1A0C4E00B3A6A2 /* RCCManager.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = RCCManager.m; sourceTree = "<group>"; tabWidth = 2; };
69 72
 		CC84A1951C1A0C4E00B3A6A2 /* RCCManagerModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCManagerModule.h; sourceTree = "<group>"; };
@@ -138,6 +141,39 @@
138 141
 			path = RCCToolBar;
139 142
 			sourceTree = "<group>";
140 143
 		};
144
+		7BBFE53F1E253144002A6182 /* old */ = {
145
+			isa = PBXGroup;
146
+			children = (
147
+				D8D779951D04B7180050CFEA /* Helpers */,
148
+				260804D51CE0D7090094DBA1 /* RCCToolBar */,
149
+				D85082BB1CBCF42400FDB961 /* RCCDrawerController */,
150
+				CC84A1931C1A0C4E00B3A6A2 /* RCCManager.h */,
151
+				CC84A1941C1A0C4E00B3A6A2 /* RCCManager.m */,
152
+				CC84A1951C1A0C4E00B3A6A2 /* RCCManagerModule.h */,
153
+				CC84A1961C1A0C4E00B3A6A2 /* RCCManagerModule.m */,
154
+				CC84A1971C1A0C4E00B3A6A2 /* RCCNavigationController.h */,
155
+				CC84A1981C1A0C4E00B3A6A2 /* RCCNavigationController.m */,
156
+				CC84A1991C1A0C4E00B3A6A2 /* RCCTabBarController.h */,
157
+				CC84A19A1C1A0C4E00B3A6A2 /* RCCTabBarController.m */,
158
+				CC84A19B1C1A0C4E00B3A6A2 /* RCCViewController.h */,
159
+				CC84A19C1C1A0C4E00B3A6A2 /* RCCViewController.m */,
160
+				D84813171C8C5EB700051BAF /* RCCLightBox.h */,
161
+				D84813181C8C5EB700051BAF /* RCCLightBox.m */,
162
+				D800E8171CFED1DB004A187F /* RCCExternalViewControllerProtocol.h */,
163
+				D83514F41D29719A00D53758 /* RCCNotification.h */,
164
+				D83514F51D29719A00D53758 /* RCCNotification.m */,
165
+				2636176D1E12722900D88A13 /* RNNTabBarController.h */,
166
+				2636176E1E12722900D88A13 /* RNNTabBarController.m */,
167
+				2606F7D81E0BC3FC00CC69CC /* RNNViewController.h */,
168
+				2606F7D91E0BC3FC00CC69CC /* RNNViewController.m */,
169
+				263617521E124FA100D88A13 /* RNNNavigationController.h */,
170
+				263617531E124FA100D88A13 /* RNNNavigationController.m */,
171
+				2636F15F1E0EC9E7007ABB09 /* RNNStyler.h */,
172
+				2636F1601E0EC9E7007ABB09 /* RNNStyler.m */,
173
+			);
174
+			name = old;
175
+			sourceTree = "<group>";
176
+		};
141 177
 		D85082BB1CBCF42400FDB961 /* RCCDrawerController */ = {
142 178
 			isa = PBXGroup;
143 179
 			children = (
@@ -206,32 +242,9 @@
206 242
 		D8AFADB41BEE6F3F00A4592D = {
207 243
 			isa = PBXGroup;
208 244
 			children = (
209
-				D8D779951D04B7180050CFEA /* Helpers */,
210
-				260804D51CE0D7090094DBA1 /* RCCToolBar */,
211
-				D85082BB1CBCF42400FDB961 /* RCCDrawerController */,
212
-				CC84A1931C1A0C4E00B3A6A2 /* RCCManager.h */,
213
-				CC84A1941C1A0C4E00B3A6A2 /* RCCManager.m */,
214
-				CC84A1951C1A0C4E00B3A6A2 /* RCCManagerModule.h */,
215
-				CC84A1961C1A0C4E00B3A6A2 /* RCCManagerModule.m */,
216
-				CC84A1971C1A0C4E00B3A6A2 /* RCCNavigationController.h */,
217
-				CC84A1981C1A0C4E00B3A6A2 /* RCCNavigationController.m */,
218
-				CC84A1991C1A0C4E00B3A6A2 /* RCCTabBarController.h */,
219
-				CC84A19A1C1A0C4E00B3A6A2 /* RCCTabBarController.m */,
220
-				CC84A19B1C1A0C4E00B3A6A2 /* RCCViewController.h */,
221
-				CC84A19C1C1A0C4E00B3A6A2 /* RCCViewController.m */,
222
-				D84813171C8C5EB700051BAF /* RCCLightBox.h */,
223
-				D84813181C8C5EB700051BAF /* RCCLightBox.m */,
224
-				D800E8171CFED1DB004A187F /* RCCExternalViewControllerProtocol.h */,
225
-				D83514F41D29719A00D53758 /* RCCNotification.h */,
226
-				D83514F51D29719A00D53758 /* RCCNotification.m */,
227
-				2636176D1E12722900D88A13 /* RNNTabBarController.h */,
228
-				2636176E1E12722900D88A13 /* RNNTabBarController.m */,
229
-				2606F7D81E0BC3FC00CC69CC /* RNNViewController.h */,
230
-				2606F7D91E0BC3FC00CC69CC /* RNNViewController.m */,
231
-				263617521E124FA100D88A13 /* RNNNavigationController.h */,
232
-				263617531E124FA100D88A13 /* RNNNavigationController.m */,
233
-				2636F15F1E0EC9E7007ABB09 /* RNNStyler.h */,
234
-				2636F1601E0EC9E7007ABB09 /* RNNStyler.m */,
245
+				7BBFE5421E25330E002A6182 /* RNNBridgeModule.h */,
246
+				7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */,
247
+				7BBFE53F1E253144002A6182 /* old */,
235 248
 				D8AFADBE1BEE6F3F00A4592D /* Products */,
236 249
 			);
237 250
 			sourceTree = "<group>";
@@ -316,6 +329,7 @@
316 329
 				D83514F61D29719A00D53758 /* RCCNotification.m in Sources */,
317 330
 				CC84A19F1C1A0C4E00B3A6A2 /* RCCManagerModule.m in Sources */,
318 331
 				26AFF3F51D7EEE2400CBA211 /* RCCTitleViewHelper.m in Sources */,
332
+				7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */,
319 333
 				D8D779981D04B7180050CFEA /* RCTHelpers.m in Sources */,
320 334
 				D85082E81CBCF54200FDB961 /* SidebarLuvocracyAnimation.m in Sources */,
321 335
 				D85082E31CBCF54200FDB961 /* SidebarAirbnbAnimation.m in Sources */,

+ 82
- 22
yarn.lock Vedi File

@@ -64,8 +64,8 @@ ajv-keywords@^1.0.0:
64 64
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.0.tgz#c11e6859eafff83e0dafc416929472eca946aa2c"
65 65
 
66 66
 ajv@^4.7.0:
67
-  version "4.10.3"
68
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.10.3.tgz#3e4fea9675b157de7888b80dd0ed735b83f28e11"
67
+  version "4.10.4"
68
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.10.4.tgz#c0974dd00b3464984892d6010aa9c2c945933254"
69 69
   dependencies:
70 70
     co "^4.6.0"
71 71
     json-stable-stringify "^1.0.1"
@@ -184,6 +184,13 @@ array-unique@^0.2.1:
184 184
   version "0.2.1"
185 185
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
186 186
 
187
+array.prototype.find@^2.0.1:
188
+  version "2.0.1"
189
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.1.tgz#1557f888df6c57e4d1256f20852d687a25b51fde"
190
+  dependencies:
191
+    define-properties "^1.1.2"
192
+    es-abstract "^1.5.0"
193
+
187 194
 arrify@^1.0.0, arrify@^1.0.1:
188 195
   version "1.0.1"
189 196
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -1572,6 +1579,13 @@ deep-is@~0.1.3:
1572 1579
   version "0.1.3"
1573 1580
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
1574 1581
 
1582
+define-properties@^1.1.2:
1583
+  version "1.1.2"
1584
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
1585
+  dependencies:
1586
+    foreach "^2.0.5"
1587
+    object-keys "^1.0.8"
1588
+
1575 1589
 defined@^1.0.0:
1576 1590
   version "1.0.0"
1577 1591
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -1662,11 +1676,7 @@ dom-walk@^0.1.0:
1662 1676
   version "0.1.1"
1663 1677
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
1664 1678
 
1665
-domelementtype@1:
1666
-  version "1.3.0"
1667
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
1668
-
1669
-domelementtype@~1.1.1:
1679
+domelementtype@1, domelementtype@~1.1.1:
1670 1680
   version "1.1.3"
1671 1681
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
1672 1682
 
@@ -1790,6 +1800,23 @@ errorhandler@~1.4.2:
1790 1800
     accepts "~1.3.0"
1791 1801
     escape-html "~1.0.3"
1792 1802
 
1803
+es-abstract@^1.5.0:
1804
+  version "1.6.1"
1805
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.6.1.tgz#bb8a2064120abcf928a086ea3d9043114285ec99"
1806
+  dependencies:
1807
+    es-to-primitive "^1.1.1"
1808
+    function-bind "^1.1.0"
1809
+    is-callable "^1.1.3"
1810
+    is-regex "^1.0.3"
1811
+
1812
+es-to-primitive@^1.1.1:
1813
+  version "1.1.1"
1814
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
1815
+  dependencies:
1816
+    is-callable "^1.1.1"
1817
+    is-date-object "^1.0.1"
1818
+    is-symbol "^1.0.1"
1819
+
1793 1820
 es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.7:
1794 1821
   version "0.10.12"
1795 1822
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047"
@@ -1897,9 +1924,10 @@ eslint-plugin-react-native@2.x.x:
1897 1924
     eslint "3.12.0"
1898 1925
 
1899 1926
 eslint-plugin-react@6.x.x:
1900
-  version "6.8.0"
1901
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.8.0.tgz#741ab5438a094532e5ce1bbb935d6832356f492d"
1927
+  version "6.9.0"
1928
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.9.0.tgz#54c2e9906b76f9d10142030bdc34e9d6840a0bb2"
1902 1929
   dependencies:
1930
+    array.prototype.find "^2.0.1"
1903 1931
     doctrine "^1.2.2"
1904 1932
     jsx-ast-utils "^1.3.4"
1905 1933
 
@@ -1943,8 +1971,8 @@ eslint@3.12.0:
1943 1971
     user-home "^2.0.0"
1944 1972
 
1945 1973
 eslint@3.x.x:
1946
-  version "3.12.2"
1947
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.12.2.tgz#6be5a9aa29658252abd7f91e9132bab1f26f3c34"
1974
+  version "3.13.1"
1975
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.13.1.tgz#564d2646b5efded85df96985332edd91a23bff25"
1948 1976
   dependencies:
1949 1977
     babel-code-frame "^6.16.0"
1950 1978
     chalk "^1.1.3"
@@ -1976,7 +2004,7 @@ eslint@3.x.x:
1976 2004
     require-uncached "^1.0.2"
1977 2005
     shelljs "^0.7.5"
1978 2006
     strip-bom "^3.0.0"
1979
-    strip-json-comments "~1.0.1"
2007
+    strip-json-comments "~2.0.1"
1980 2008
     table "^3.7.8"
1981 2009
     text-table "~0.2.0"
1982 2010
     user-home "^2.0.0"
@@ -2242,6 +2270,10 @@ for-own@^0.1.4:
2242 2270
   dependencies:
2243 2271
     for-in "^0.1.5"
2244 2272
 
2273
+foreach@^2.0.5:
2274
+  version "2.0.5"
2275
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
2276
+
2245 2277
 forever-agent@~0.6.1:
2246 2278
   version "0.6.1"
2247 2279
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -2283,8 +2315,8 @@ fs.realpath@^1.0.0:
2283 2315
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
2284 2316
 
2285 2317
 fsevents@^1.0.0:
2286
-  version "1.0.15"
2287
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.15.tgz#fa63f590f3c2ad91275e4972a6cea545fb0aae44"
2318
+  version "1.0.17"
2319
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558"
2288 2320
   dependencies:
2289 2321
     nan "^2.3.0"
2290 2322
     node-pre-gyp "^0.6.29"
@@ -2306,6 +2338,10 @@ fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
2306 2338
     mkdirp ">=0.5 0"
2307 2339
     rimraf "2"
2308 2340
 
2341
+function-bind@^1.1.0:
2342
+  version "1.1.0"
2343
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
2344
+
2309 2345
 gauge@~1.2.5:
2310 2346
   version "1.2.7"
2311 2347
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
@@ -2813,12 +2849,20 @@ is-bzip2@^1.0.0:
2813 2849
   version "1.0.0"
2814 2850
   resolved "https://registry.yarnpkg.com/is-bzip2/-/is-bzip2-1.0.0.tgz#5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"
2815 2851
 
2852
+is-callable@^1.1.1, is-callable@^1.1.3:
2853
+  version "1.1.3"
2854
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
2855
+
2816 2856
 is-ci@^1.0.9:
2817 2857
   version "1.0.10"
2818 2858
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
2819 2859
   dependencies:
2820 2860
     ci-info "^1.0.0"
2821 2861
 
2862
+is-date-object@^1.0.1:
2863
+  version "1.0.1"
2864
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
2865
+
2822 2866
 is-dotfile@^1.0.0:
2823 2867
   version "1.0.2"
2824 2868
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
@@ -2928,6 +2972,10 @@ is-redirect@^1.0.0:
2928 2972
   version "1.0.0"
2929 2973
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
2930 2974
 
2975
+is-regex@^1.0.3:
2976
+  version "1.0.3"
2977
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.3.tgz#0d55182bddf9f2fde278220aec3a75642c908637"
2978
+
2931 2979
 is-relative@^0.1.0:
2932 2980
   version "0.1.3"
2933 2981
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
@@ -2946,6 +2994,10 @@ is-stream@^1.0.0, is-stream@^1.0.1:
2946 2994
   version "1.1.0"
2947 2995
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
2948 2996
 
2997
+is-symbol@^1.0.1:
2998
+  version "1.0.1"
2999
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
3000
+
2949 3001
 is-tar@^1.0.0:
2950 3002
   version "1.0.0"
2951 3003
   resolved "https://registry.yarnpkg.com/is-tar/-/is-tar-1.0.0.tgz#2f6b2e1792c1f5bb36519acaa9d65c0d26fe853d"
@@ -3534,8 +3586,8 @@ lodash.isarray@^3.0.0:
3534 3586
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
3535 3587
 
3536 3588
 lodash.isequal@^4.0.0:
3537
-  version "4.4.0"
3538
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.4.0.tgz#6295768e98e14dc15ce8d362ef6340db82852031"
3589
+  version "4.5.0"
3590
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
3539 3591
 
3540 3592
 lodash.keys@^3.0.0:
3541 3593
   version "3.1.2"
@@ -3883,8 +3935,8 @@ negotiator@0.6.1:
3883 3935
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
3884 3936
 
3885 3937
 node-emoji@^1.4.1:
3886
-  version "1.4.3"
3887
-  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.4.3.tgz#5272f70b823c4df6d7c39f84fd8203f35b3e5d36"
3938
+  version "1.5.0"
3939
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.0.tgz#9a0d9fe03fd43afa357d6d8e439aa31e599959b7"
3888 3940
   dependencies:
3889 3941
     string.prototype.codepointat "^0.2.0"
3890 3942
 
@@ -3999,6 +4051,10 @@ object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
3999 4051
   version "4.1.0"
4000 4052
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
4001 4053
 
4054
+object-keys@^1.0.8:
4055
+  version "1.0.11"
4056
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
4057
+
4002 4058
 object.omit@^2.0.0:
4003 4059
   version "2.0.1"
4004 4060
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -4578,8 +4634,8 @@ regjsparser@^0.1.4:
4578 4634
     jsesc "~0.5.0"
4579 4635
 
4580 4636
 remx@0.1.x:
4581
-  version "0.1.35"
4582
-  resolved "https://registry.yarnpkg.com/remx/-/remx-0.1.35.tgz#dc8e8fa2c9b28805213dad85f647f64f4a78adf5"
4637
+  version "0.1.36"
4638
+  resolved "https://registry.yarnpkg.com/remx/-/remx-0.1.36.tgz#d7e761d98feeec785866c7924ec476b65e532fd3"
4583 4639
   dependencies:
4584 4640
     lodash "4.x.x"
4585 4641
     mobx "2.x.x"
@@ -4800,8 +4856,8 @@ shelljs@^0.5.0:
4800 4856
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
4801 4857
 
4802 4858
 shelljs@^0.7.5:
4803
-  version "0.7.5"
4804
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.5.tgz#2eef7a50a21e1ccf37da00df767ec69e30ad0675"
4859
+  version "0.7.6"
4860
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
4805 4861
   dependencies:
4806 4862
     glob "^7.0.0"
4807 4863
     interpret "^1.0.0"
@@ -5034,6 +5090,10 @@ strip-json-comments@~1.0.1, strip-json-comments@~1.0.4:
5034 5090
   version "1.0.4"
5035 5091
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
5036 5092
 
5093
+strip-json-comments@~2.0.1:
5094
+  version "2.0.1"
5095
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
5096
+
5037 5097
 strip-outer@^1.0.0:
5038 5098
   version "1.0.0"
5039 5099
   resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.0.tgz#aac0ba60d2e90c5d4f275fd8869fd9a2d310ffb8"