Browse Source

fixed xcpretty

Daniel Zlotin 7 years ago
parent
commit
62e5bb5330
2 changed files with 28 additions and 24 deletions
  1. 1
    1
      playground/scripts/e2e.ios.js
  2. 27
    23
      yarn.lock

+ 1
- 1
playground/scripts/e2e.ios.js View File

@@ -24,7 +24,7 @@ function buildProjForDetox() {
24 24
             -derivedDataPath ./DerivedData/playground`;
25 25
 
26 26
   if (hasXcpretty()) {
27
-    shellUtils.exec.execSync(`${cmd} | xcpretty && exit ${PIPESTATUS[0]}`);
27
+    shellUtils.exec.execSync(`set -o pipefail && ${cmd} | xcpretty`);
28 28
   } else {
29 29
     shellUtils.exec.execSync(`${cmd}`);
30 30
   }

+ 27
- 23
yarn.lock View File

@@ -87,8 +87,8 @@ ansi-escapes@^1.1.0, ansi-escapes@^1.4.0:
87 87
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
88 88
 
89 89
 ansi-regex@^2.0.0:
90
-  version "2.0.0"
91
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107"
90
+  version "2.1.1"
91
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
92 92
 
93 93
 ansi-styles@^2.2.1:
94 94
   version "2.2.1"
@@ -871,8 +871,8 @@ babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.19
871 871
     to-fast-properties "^1.0.1"
872 872
 
873 873
 babylon@^6.11.0, babylon@^6.13.0, babylon@^6.13.1:
874
-  version "6.14.1"
875
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.14.1.tgz#956275fab72753ad9b3435d7afe58f8bf0a29815"
874
+  version "6.15.0"
875
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
876 876
 
877 877
 balanced-match@^0.4.1:
878 878
   version "0.4.2"
@@ -2716,7 +2716,7 @@ http-signature@~1.1.0:
2716 2716
     jsprim "^1.2.2"
2717 2717
     sshpk "^1.7.0"
2718 2718
 
2719
-iconv-lite@0.4.11, iconv-lite@^0.4.5:
2719
+iconv-lite@0.4.11:
2720 2720
   version "0.4.11"
2721 2721
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.11.tgz#2ecb42fd294744922209a2e7c404dac8793d8ade"
2722 2722
 
@@ -2724,7 +2724,7 @@ iconv-lite@0.4.13:
2724 2724
   version "0.4.13"
2725 2725
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
2726 2726
 
2727
-iconv-lite@^0.4.13, iconv-lite@~0.4.13:
2727
+iconv-lite@^0.4.13, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
2728 2728
   version "0.4.15"
2729 2729
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
2730 2730
 
@@ -3336,6 +3336,10 @@ js-tokens@^2.0.0:
3336 3336
   version "2.0.0"
3337 3337
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5"
3338 3338
 
3339
+js-tokens@^3.0.0:
3340
+  version "3.0.0"
3341
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.0.tgz#a2f2a969caae142fb3cd56228358c89366957bd1"
3342
+
3339 3343
 js-yaml@^3.5.1, js-yaml@^3.7.0:
3340 3344
   version "3.7.0"
3341 3345
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
@@ -3661,10 +3665,10 @@ longest@^1.0.1:
3661 3665
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
3662 3666
 
3663 3667
 loose-envify@^1.0.0, loose-envify@^1.1.0:
3664
-  version "1.3.0"
3665
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.0.tgz#6b26248c42f6d4fa4b0d8542f78edfcde35642a8"
3668
+  version "1.3.1"
3669
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
3666 3670
   dependencies:
3667
-    js-tokens "^2.0.0"
3671
+    js-tokens "^3.0.0"
3668 3672
 
3669 3673
 loud-rejection@^1.0.0:
3670 3674
   version "1.6.0"
@@ -3791,9 +3795,9 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
3791 3795
     parse-glob "^3.0.4"
3792 3796
     regex-cache "^0.4.2"
3793 3797
 
3794
-"mime-db@>= 1.24.0 < 2", mime-db@~1.25.0:
3795
-  version "1.25.0"
3796
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.25.0.tgz#c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"
3798
+"mime-db@>= 1.24.0 < 2", mime-db@~1.26.0:
3799
+  version "1.26.0"
3800
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff"
3797 3801
 
3798 3802
 mime-db@~1.23.0:
3799 3803
   version "1.23.0"
@@ -3806,10 +3810,10 @@ mime-types@2.1.11, mime-types@~2.1.9:
3806 3810
     mime-db "~1.23.0"
3807 3811
 
3808 3812
 mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.6, mime-types@~2.1.7:
3809
-  version "2.1.13"
3810
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.13.tgz#e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"
3813
+  version "2.1.14"
3814
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"
3811 3815
   dependencies:
3812
-    mime-db "~1.25.0"
3816
+    mime-db "~1.26.0"
3813 3817
 
3814 3818
 mime@1.3.4, mime@^1.3.4:
3815 3819
   version "1.3.4"
@@ -3935,8 +3939,8 @@ negotiator@0.6.1:
3935 3939
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
3936 3940
 
3937 3941
 node-emoji@^1.4.1:
3938
-  version "1.5.0"
3939
-  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.0.tgz#9a0d9fe03fd43afa357d6d8e439aa31e599959b7"
3942
+  version "1.5.1"
3943
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.1.tgz#fd918e412769bf8c448051238233840b2aff16a1"
3940 3944
   dependencies:
3941 3945
     string.prototype.codepointat "^0.2.0"
3942 3946
 
@@ -4909,8 +4913,8 @@ sntp@1.x.x:
4909 4913
     hoek "2.x.x"
4910 4914
 
4911 4915
 source-map-support@^0.4.2:
4912
-  version "0.4.8"
4913
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.8.tgz#4871918d8a3af07289182e974e32844327b2e98b"
4916
+  version "0.4.9"
4917
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.9.tgz#45eaa04f067e049d987b27599ed014a37750aaff"
4914 4918
   dependencies:
4915 4919
     source-map "^0.5.3"
4916 4920
 
@@ -4960,8 +4964,8 @@ sprintf-js@^1.0.3, sprintf-js@~1.0.2:
4960 4964
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
4961 4965
 
4962 4966
 sshpk@^1.7.0:
4963
-  version "1.10.1"
4964
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.10.1.tgz#30e1a5d329244974a1af61511339d595af6638b0"
4967
+  version "1.10.2"
4968
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.10.2.tgz#d5a804ce22695515638e798dbe23273de070a5fa"
4965 4969
   dependencies:
4966 4970
     asn1 "~0.2.3"
4967 4971
     assert-plus "^1.0.0"
@@ -5563,8 +5567,8 @@ whatwg-fetch@>=0.10.0, whatwg-fetch@^1.0.0:
5563 5567
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319"
5564 5568
 
5565 5569
 whatwg-url@^4.1.0:
5566
-  version "4.2.0"
5567
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.2.0.tgz#abf1a3f5ff4bc2005b3f0c2119382631789d8e44"
5570
+  version "4.3.0"
5571
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.3.0.tgz#92aaee21f4f2a642074357d70ef8500a7cbb171a"
5568 5572
   dependencies:
5569 5573
     tr46 "~0.0.3"
5570 5574
     webidl-conversions "^3.0.0"