summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2018-07-03 16:06:18 +0200
committerAndrej Mihajlov <and@mullvad.net>2018-07-05 16:01:47 +0200
commit4b954c5c7e13e7970e7f9dbd8c0dadc0f3236a94 (patch)
treeee3ed589c4fc329b1c85e340c74862d96db92a37
parenta26471139d547bbcdcf07834480bb3f7b8477508 (diff)
downloadmullvadvpn-4b954c5c7e13e7970e7f9dbd8c0dadc0f3236a94.tar.xz
mullvadvpn-4b954c5c7e13e7970e7f9dbd8c0dadc0f3236a94.zip
Upgrade reactxp to 1.3.0
-rw-r--r--package.json2
-rw-r--r--yarn.lock79
2 files changed, 41 insertions, 40 deletions
diff --git a/package.json b/package.json
index e8ede62cc7..2128fbf2aa 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"react-router": "^4.2.0",
"react-router-redux": "^5.0.0-alpha.9",
"react-simple-maps": "^0.10.1",
- "reactxp": "1.3.0-rc.6",
+ "reactxp": "^1.3.0",
"redux": "^3.0.0",
"redux-thunk": "^2.2.0",
"uuid": "^3.0.1",
diff --git a/yarn.lock b/yarn.lock
index e25dbfd6d7..53d87f03bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -86,14 +86,14 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
+"@types/lodash@4.14.110":
+ version "4.14.110"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.110.tgz#fb07498f84152947f30ea09d89207ca07123461e"
+
"@types/lodash@^4.14.64":
version "4.14.91"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.91.tgz#794611b28056d16b5436059c6d800b39d573cd3a"
-"@types/lodash@^4.14.80":
- version "4.14.105"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.105.tgz#9fcc4627a1f98f8f8fce79ddb2bff4afd97e959b"
-
"@types/node@*":
version "8.5.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.2.tgz#83b8103fa9a2c2e83d78f701a9aa7c9539739aa5"
@@ -102,16 +102,16 @@
version "8.9.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.4.tgz#dfd327582a06c114eb6e0441fa3d6fab35edad48"
-"@types/react-dom@^16.0.6":
+"@types/react-dom@16.0.6":
version "16.0.6"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.6.tgz#f1a65a4e7be8ed5d123f8b3b9eacc913e35a1a3c"
dependencies:
"@types/node" "*"
"@types/react" "*"
-"@types/react-native@^0.55.23":
- version "0.55.25"
- resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.55.25.tgz#68484f8c3f1ab0ccce21ea556dcbcf20140f0c63"
+"@types/react-native@0.55.26":
+ version "0.55.26"
+ resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.55.26.tgz#a7150ca15e0de7e435cc66a1ca44f6b506c99e40"
dependencies:
"@types/react" "*"
@@ -119,11 +119,9 @@
version "16.0.31"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.31.tgz#5285da62f3ac62b797f6d0729a1d6181f3180c3e"
-"@types/react@^16.3.17":
- version "16.3.17"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.17.tgz#d59d1a632570b0713946ed9c2949d994773633c5"
- dependencies:
- csstype "^2.2.0"
+"@types/react@16.0.36":
+ version "16.0.36"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.36.tgz#ceb5639013bdb92a94147883052e69bb2c22c69b"
abbrev@1:
version "1.1.1"
@@ -374,7 +372,7 @@ assert-plus@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-assert@^1.3.0:
+assert@1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
dependencies:
@@ -2141,10 +2139,6 @@ css-what@2.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
-csstype@^2.2.0:
- version "2.5.3"
- resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.3.tgz#2504152e6e1cc59b32098b7f5d6a63f16294c1f7"
-
csurf@~1.8.3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/csurf/-/csurf-1.8.3.tgz#23f2a13bf1d8fce1d0c996588394442cba86a56a"
@@ -4898,6 +4892,10 @@ lodash.templatesettings@^3.0.0:
lodash._reinterpolate "^3.0.0"
lodash.escape "^3.0.0"
+lodash@4.17.10, lodash@^4.17.10, lodash@^4.17.4:
+ version "4.17.10"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
lodash@^3.1.0, lodash@^3.10.1, lodash@^3.2.0, lodash@^3.3.1, lodash@^3.5.0:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
@@ -4910,10 +4908,6 @@ lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.2.1, lodash@^4.3.0, lo
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-lodash@^4.17.10, lodash@^4.17.4:
- version "4.17.10"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
log-symbols@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -6040,7 +6034,14 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0:
+prop-types@15.6.2:
+ version "15.6.2"
+ resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+ dependencies:
+ loose-envify "^1.3.1"
+ object-assign "^4.1.1"
+
+prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
dependencies:
@@ -6350,20 +6351,20 @@ react@^16.0.0:
object-assign "^4.1.1"
prop-types "^15.6.0"
-reactxp@1.3.0-rc.6:
- version "1.3.0-rc.6"
- resolved "https://registry.yarnpkg.com/reactxp/-/reactxp-1.3.0-rc.6.tgz#11e68d2e450926b7b51d507300041912eb3dfc61"
+reactxp@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/reactxp/-/reactxp-1.3.0.tgz#ccb3859b7713ea0cb921fa3155c84f02b36b0f17"
dependencies:
- "@types/lodash" "^4.14.80"
- "@types/react" "^16.3.17"
- "@types/react-dom" "^16.0.6"
- "@types/react-native" "^0.55.23"
- assert "^1.3.0"
- lodash "^4.17.4"
- prop-types "^15.5.9"
- rebound "^0.1.0"
- subscribableevent "^1.0.0"
- synctasks "^0.3.3"
+ "@types/lodash" "4.14.110"
+ "@types/react" "16.0.36"
+ "@types/react-dom" "16.0.6"
+ "@types/react-native" "0.55.26"
+ assert "1.4.1"
+ lodash "4.17.10"
+ prop-types "15.6.2"
+ rebound "0.1.0"
+ subscribableevent "1.0.0"
+ synctasks "0.3.3"
read-all-stream@^3.0.0:
version "3.1.0"
@@ -6520,7 +6521,7 @@ readline2@^1.0.1:
is-fullwidth-code-point "^1.0.0"
mute-stream "0.0.5"
-rebound@^0.1.0:
+rebound@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/rebound/-/rebound-0.1.0.tgz#0638c61a93666bb515a58a03e1cfb34021e88b72"
@@ -7387,7 +7388,7 @@ strip-outer@^1.0.0:
dependencies:
escape-string-regexp "^1.0.2"
-subscribableevent@^1.0.0:
+subscribableevent@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/subscribableevent/-/subscribableevent-1.0.0.tgz#bde9500fa9009c7740c924109bac6119cd9898e6"
dependencies:
@@ -7443,7 +7444,7 @@ sync-exec@~0.6.x:
version "0.6.2"
resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105"
-synctasks@^0.3.3:
+synctasks@0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/synctasks/-/synctasks-0.3.3.tgz#1e3dde423b39d28bc940fdb7698d8b4b7a741e77"