summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2018-02-13 12:48:16 +0100
committerAndrej Mihajlov <and@mullvad.net>2018-02-13 12:48:16 +0100
commitc6d4b3a2370fa6feeaaf33f0425127753e93039e (patch)
tree07ee948e1fbdd569cd1e1c1255b07505b15b91ae
parenta62650251dd35d7364b9cd404a2df42d59fbb846 (diff)
parente1bcdeb561352e54200dfb9a9bd7d8268655b8e2 (diff)
downloadmullvadvpn-c6d4b3a2370fa6feeaaf33f0425127753e93039e.tar.xz
mullvadvpn-c6d4b3a2370fa6feeaaf33f0425127753e93039e.zip
Merge branch 'update-dependencies'
-rw-r--r--.travis.yml13
-rw-r--r--package.json6
-rw-r--r--yarn.lock73
3 files changed, 49 insertions, 43 deletions
diff --git a/.travis.yml b/.travis.yml
index 047c274817..add321f7ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
node_js: '8'
cache: yarn
- install: &node_install
+ install:
- yarn install
# FIXME: Flow throws error for optional dependencies
@@ -24,20 +24,13 @@ matrix:
echo "module.exports = {};" > $FILE;
fi
done
- before_script: &node_before_script
+ before_script:
- export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start
- script: &node_script
+ script:
- yarn run lint
- yarn run flow
- yarn test
- - language: node_js
- node_js: '7'
- cache: yarn
- install: *node_install
- before_script: *node_before_script
- script: *node_script
-
# Backend macOS
- language: rust
diff --git a/package.json b/package.json
index a23201b07c..52a84650aa 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"history": "^4.6.1",
"jsonrpc-lite": "^1.2.3",
"mkdirp": "^0.5.1",
- "moment": "^2.17.1",
+ "moment": "^2.20.1",
"rbush": "^2.0.2",
"react": "^16.0.0",
"react-dom": "^16.0.0",
@@ -43,7 +43,7 @@
"babel-cli": "^6.22.2",
"babel-core": "^6.25.0",
"babel-eslint": "^8.2.1",
- "babel-plugin-inline-react-svg": "^0.4.0",
+ "babel-plugin-inline-react-svg": "^0.5.2",
"babel-plugin-transform-runtime": "^6.22.0",
"babel-preset-es2015": "^6.1.18",
"babel-preset-react": "^6.22.0",
@@ -51,7 +51,7 @@
"browser-sync": "^2.23.6",
"chai": "^4.1.0",
"cross-env": "^5.1.3",
- "electron": "^1.7.9",
+ "electron": "^1.8.2",
"electron-builder": "^19.37.2",
"electron-devtools-installer": "^2.2.1",
"electron-mocha": "^5.0.0",
diff --git a/yarn.lock b/yarn.lock
index b251479131..89844a084f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -87,8 +87,8 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.2.tgz#83b8103fa9a2c2e83d78f701a9aa7c9539739aa5"
"@types/node@^8.0.24":
- version "8.5.9"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.9.tgz#7155cfb4ae405bca4dd8df1a214c339e939109bf"
+ version "8.9.1"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.1.tgz#5a329d73a97f3c5a626dfe0ed8c0b831fee5357a"
"@types/react-dom@^16.0.0":
version "16.0.3"
@@ -621,9 +621,9 @@ babel-plugin-external-helpers@^6.18.0:
dependencies:
babel-runtime "^6.22.0"
-babel-plugin-inline-react-svg@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-inline-react-svg/-/babel-plugin-inline-react-svg-0.4.0.tgz#940f77be66324f2c75a0fb64f287f459c40602a7"
+babel-plugin-inline-react-svg@^0.5.2:
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-inline-react-svg/-/babel-plugin-inline-react-svg-0.5.2.tgz#f4c9ea5384e8d08a7a4f96a19f22a5eab0ddf3a9"
dependencies:
babel-template "^6.15.0"
babel-traverse "^6.15.0"
@@ -1249,11 +1249,7 @@ babylon@7.0.0-beta.36:
version "7.0.0-beta.36"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e"
-babylon@^6.10.0:
- version "6.17.2"
- resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.2.tgz#201d25ef5f892c41bae49488b08db0dd476e9f5c"
-
-babylon@^6.18.0:
+babylon@^6.10.0, babylon@^6.18.0:
version "6.18.0"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
@@ -1432,8 +1428,8 @@ bplist-parser@0.1.1:
big-integer "^1.6.7"
brace-expansion@^1.1.7:
- version "1.1.8"
- resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+ version "1.1.9"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.9.tgz#acdc7dde0e939fb3b32fe933336573e2a7dc2b7c"
dependencies:
balanced-match "^1.0.0"
concat-map "0.0.1"
@@ -2056,8 +2052,8 @@ core-js@^2.2.2, core-js@^2.4.1, core-js@^2.5.0:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
core-js@^2.4.0:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+ version "2.5.3"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
@@ -2761,9 +2757,9 @@ electron-window@^0.8.0:
dependencies:
is-electron-renderer "^2.0.0"
-electron@^1.7.9:
- version "1.8.1"
- resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.1.tgz#19b6f39f2013e204a91a60bc3086dc7a4a07ed88"
+electron@^1.8.2:
+ version "1.8.2"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.2.tgz#a817cd733c2972b3c7cc4f777caf6e424b88014d"
dependencies:
"@types/node" "^8.0.24"
electron-download "^3.0.1"
@@ -2923,8 +2919,8 @@ es-to-primitive@^1.1.1:
is-symbol "^1.0.1"
es6-promise@^4.0.5:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.2.tgz#f722d7769af88bd33bc13ec6605e1f92966b82d9"
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
escape-html@1.0.2:
version "1.0.2"
@@ -4912,10 +4908,14 @@ 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"
-lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.1, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
+lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.1, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+lodash@^4.17.4:
+ version "4.17.5"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+
log-symbols@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -5247,7 +5247,7 @@ mocha@^4.0.1:
mkdirp "0.5.1"
supports-color "4.4.0"
-moment@^2.17.1:
+moment@^2.20.1:
version "2.20.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
@@ -6091,7 +6091,7 @@ rbush@^2.0.2:
dependencies:
quickselect "^1.0.1"
-rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1:
+rc@^1.0.1, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
dependencies:
@@ -6100,6 +6100,15 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
+rc@^1.1.2:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
+ dependencies:
+ deep-extend "~0.4.0"
+ ini "~1.3.0"
+ minimist "^1.2.0"
+ strip-json-comments "~2.0.1"
+
react-clone-referenced-element@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/react-clone-referenced-element/-/react-clone-referenced-element-1.0.1.tgz#2bba8c69404c5e4a944398600bcc4c941f860682"
@@ -6779,14 +6788,14 @@ semver-diff@^2.0.0:
dependencies:
semver "^5.0.3"
-"semver@2 || 3 || 4 || 5", semver@5.x, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
- version "5.4.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
-semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+semver@5.x, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1:
+ version "5.4.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+
send@0.13.2:
version "0.13.2"
resolved "https://registry.yarnpkg.com/send/-/send-0.13.2.tgz#765e7607c8055452bba6f0b052595350986036de"
@@ -7067,7 +7076,11 @@ source-map-support@^0.5.1:
dependencies:
source-map "^0.6.0"
-source-map@^0.5.3, source-map@^0.5.6:
+source-map@^0.5.3:
+ version "0.5.7"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.5.6:
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
@@ -7794,11 +7807,11 @@ uuid@^2.0.1:
version "2.0.3"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-uuid@^3.0.0, uuid@^3.1.0:
+uuid@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-uuid@^3.0.1:
+uuid@^3.0.1, uuid@^3.1.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"