summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2017-12-05 11:17:55 +0100
committerAndrej Mihajlov <and@mullvad.net>2017-12-05 11:17:55 +0100
commit8c4afd6f29d134acbe05e95b36d2daf0f3239b9a (patch)
treeb63d1be381f1c3333f567edbbdef99947f43833a
parent53e28e0abae370a7b8c7da3847b3a5ba0934b45e (diff)
parent32f9ca6ed4d4b48236627e2381859f82dc4389fd (diff)
downloadmullvadvpn-8c4afd6f29d134acbe05e95b36d2daf0f3239b9a.tar.xz
mullvadvpn-8c4afd6f29d134acbe05e95b36d2daf0f3239b9a.zip
Merge branch 'upgrade-flow-typed'
-rw-r--r--package.json2
-rw-r--r--yarn.lock65
2 files changed, 15 insertions, 52 deletions
diff --git a/package.json b/package.json
index 3eefad20da..99318b1ce2 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
"eslint-plugin-flowtype": "^2.39.1",
"eslint-plugin-react": "^7.5.1",
"flow-bin": "^0.50.0",
- "flow-typed": "^2.1.5",
+ "flow-typed": "^2.2.3",
"npm-run-all": "^4.0.1",
"react-test-renderer": "^15.6.1",
"redux-mock-store": "^1.3.0",
diff --git a/yarn.lock b/yarn.lock
index 85345aff25..03a2496f76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -107,13 +107,6 @@ after@0.8.1:
version "0.8.1"
resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627"
-agent-base@2:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.1.1.tgz#d6de10d5af6132d5bd692427d46fc538539094c7"
- dependencies:
- extend "~3.0.0"
- semver "~5.0.1"
-
ajv-keywords@^1.0.0:
version "1.5.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
@@ -1792,12 +1785,6 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"
-debug@2, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.8:
- version "2.6.8"
- resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
- dependencies:
- ms "2.0.0"
-
debug@2.2.0, debug@~2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
@@ -1822,6 +1809,12 @@ debug@2.6.4:
dependencies:
ms "0.7.3"
+debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.8:
+ version "2.6.8"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+ dependencies:
+ ms "2.0.0"
+
debug@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64"
@@ -2518,7 +2511,7 @@ express@2.5.x:
mkdirp "0.3.0"
qs "0.4.x"
-extend@3, extend@~3.0.0:
+extend@~3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -2670,14 +2663,14 @@ flow-remove-types@^1.1.2:
babylon "^6.15.0"
vlq "^0.2.1"
-flow-typed@^2.1.5:
- version "2.1.5"
- resolved "https://registry.yarnpkg.com/flow-typed/-/flow-typed-2.1.5.tgz#c96912807a286357340042783c9369360f384bbd"
+flow-typed@^2.2.3:
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/flow-typed/-/flow-typed-2.2.3.tgz#e7a35915a0f4cfcf8068c1ce291b5c99e6b89efa"
dependencies:
babel-polyfill "^6.23.0"
colors "^1.1.2"
fs-extra "^4.0.0"
- github "^9.2.0"
+ github "0.2.4"
glob "^7.1.2"
got "^7.1.0"
md5 "^2.1.0"
@@ -2691,13 +2684,6 @@ flow-typed@^2.1.5:
which "^1.2.14"
yargs "^4.2.0"
-follow-redirects@0.0.7:
- version "0.0.7"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-0.0.7.tgz#34b90bab2a911aa347571da90f22bd36ecd8a919"
- dependencies:
- debug "^2.2.0"
- stream-consume "^0.1.0"
-
for-in@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -2936,14 +2922,11 @@ github-from-package@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-github@^9.2.0:
- version "9.2.0"
- resolved "https://registry.yarnpkg.com/github/-/github-9.2.0.tgz#8a886dc40dd63636707dcaf99df3df26c59f16fc"
+github@0.2.4:
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/github/-/github-0.2.4.tgz#24fa7f0e13fa11b946af91134c51982a91ce538b"
dependencies:
- follow-redirects "0.0.7"
- https-proxy-agent "^1.0.0"
mime "^1.2.11"
- netrc "^0.1.4"
glob-base@^0.3.0:
version "0.3.0"
@@ -3213,14 +3196,6 @@ http-signature@~1.1.0:
jsprim "^1.2.2"
sshpk "^1.7.0"
-https-proxy-agent@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"
- dependencies:
- agent-base "2"
- debug "2"
- extend "3"
-
iconv-lite@^0.4.17, iconv-lite@^0.4.19, iconv-lite@~0.4.13:
version "0.4.19"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -4140,10 +4115,6 @@ negotiator@0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-netrc@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444"
-
nise@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/nise/-/nise-1.0.1.tgz#0da92b10a854e97c0f496f6c2845a301280b3eef"
@@ -5276,10 +5247,6 @@ semver-diff@^2.0.0:
version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-semver@~5.0.1:
- version "5.0.3"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
-
send@0.15.2:
version "0.15.2"
resolved "https://registry.yarnpkg.com/send/-/send-0.15.2.tgz#f91fab4403bcf87e716f70ceb5db2f578bdc17d6"
@@ -5580,10 +5547,6 @@ stream-combiner@~0.0.4:
dependencies:
duplexer "~0.1.1"
-stream-consume@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
-
stream-throttle@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"