diff --git a/admin/package.json b/admin/package.json index ada72135..b6f3cd69 100644 --- a/admin/package.json +++ b/admin/package.json @@ -78,7 +78,7 @@ "less": "^3.7.1", "less-loader": "^4.1.0", "lint-staged": "^7.2.2", - "lodash": "^4.17.10", + "lodash": "^4.17.15", "mini-css-extract-plugin": "^0.4.2", "moment": "^2.22.2", "prettier": "^1.13.4", diff --git a/admin/yarn.lock b/admin/yarn.lock index d63adeb2..8013e17e 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -4890,6 +4890,11 @@ lodash@^4.11.1, lodash@^4.13.1, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.11 version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" +lodash@^4.17.15: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" diff --git a/backend/requirements/prod.txt b/backend/requirements/prod.txt index e9b6103b..d51640ad 100644 --- a/backend/requirements/prod.txt +++ b/backend/requirements/prod.txt @@ -3,7 +3,7 @@ # Flask Flask==1.0.2 MarkupSafe==1.0 -Werkzeug==0.14.1 +Werkzeug==0.15.3 Jinja2==2.10.1 itsdangerous==0.24 click>=5.0 @@ -84,4 +84,4 @@ Flask-Limiter==1.0.1 validate_email==1.3 # validate URLS -validators==0.12.4 \ No newline at end of file +validators==0.12.4 diff --git a/blockchain/package.json b/blockchain/package.json index e9c40b0b..dc1faba5 100755 --- a/blockchain/package.json +++ b/blockchain/package.json @@ -34,7 +34,7 @@ "@types/cors": "2.8.4", "@types/dotenv": "^6.1.0", "@types/ws": "^6.0.1", - "axios": "0.18.0", + "axios": "0.18.1", "bitgo": "4.48.1", "body-parser": "1.18.3", "cors": "2.8.5", diff --git a/blockchain/yarn.lock b/blockchain/yarn.lock index c09b612e..9aaef9fe 100755 --- a/blockchain/yarn.lock +++ b/blockchain/yarn.lock @@ -290,12 +290,13 @@ atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" -axios@0.18.0, axios@^0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" +axios@0.18.1: + version "0.18.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" + integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g== dependencies: - follow-redirects "^1.3.0" - is-buffer "^1.1.5" + follow-redirects "1.5.10" + is-buffer "^2.0.2" axios@^0.16.2: version "0.16.2" @@ -304,6 +305,13 @@ axios@^0.16.2: follow-redirects "^1.2.3" is-buffer "^1.1.5" +axios@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" + dependencies: + follow-redirects "^1.3.0" + is-buffer "^1.1.5" + babel-runtime@^5.8.20: version "5.8.38" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-5.8.38.tgz#1c0b02eb63312f5f087ff20450827b425c9d4c19" @@ -517,9 +525,9 @@ bitgo@4.48.1: dependencies: nanoassert "^1.0.0" -"blake2b@git+https://github.com/BitGo/blake2b.git#6268e6dd678661e0acc4359e9171b97eb1ebf8ac": +"blake2b@https://github.com/BitGo/blake2b#6268e6dd678661e0acc4359e9171b97eb1ebf8ac": version "2.1.3" - resolved "git+https://github.com/BitGo/blake2b.git#6268e6dd678661e0acc4359e9171b97eb1ebf8ac" + resolved "https://github.com/BitGo/blake2b#6268e6dd678661e0acc4359e9171b97eb1ebf8ac" dependencies: blake2b-wasm "https://github.com/BitGo/blake2b-wasm#193cdb71656c1a6c7f89b05d0327bb9b758d071b" nanoassert "^1.0.0" @@ -1475,7 +1483,7 @@ finalhandler@1.1.1: statuses "~1.4.0" unpipe "~1.0.0" -follow-redirects@^1.2.3: +follow-redirects@1.5.10, follow-redirects@^1.2.3: version "1.5.10" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" dependencies: @@ -1828,6 +1836,11 @@ is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" +is-buffer@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" + integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== + is-ci@^1.0.10: version "1.2.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" diff --git a/e2e/package.json b/e2e/package.json index 00ce5f5b..bbcdff74 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -10,6 +10,7 @@ "dependencies": { "@cypress/webpack-preprocessor": "^4.0.3", "cypress": "^3.1.5", + "lodash": "^4.17.15", "ts-loader": "^5.0.0", "typescript": "^3.0.3", "webpack": "^4.17.2" diff --git a/e2e/yarn.lock b/e2e/yarn.lock index a5831ac3..4fc2ae50 100644 --- a/e2e/yarn.lock +++ b/e2e/yarn.lock @@ -2829,6 +2829,11 @@ lodash@4.17.11, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.11: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.17.15: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + log-symbols@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" diff --git a/frontend/package.json b/frontend/package.json index 4d0376b2..654f5fac 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -113,7 +113,10 @@ "less": "3.9.0", "less-loader": "^4.1.0", "lint-staged": "^7.2.2", - "lodash": "4.17.11", + "lodash": "^4.17.15", + "lodash-es": "^4.17.15", + "lodash.defaultsdeep": "^4.6.1", + "lodash.mergewith": "^4.6.2", "markdown-loader": "^4.0.0", "mini-css-extract-plugin": "^0.4.2", "moment": "^2.22.2", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index d1eca963..014e5dfb 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -7317,6 +7317,11 @@ lodash-decorators@^6.0.0: dependencies: tslib "^1.9.2" +lodash-es@^4.17.15: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" + integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ== + lodash-es@^4.17.5, lodash-es@^4.2.1: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05" @@ -7345,6 +7350,11 @@ lodash.defaultsdeep@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz#bec1024f85b1bd96cbea405b23c14ad6443a6f81" +lodash.defaultsdeep@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" + integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== + lodash.endswith@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09" @@ -7385,6 +7395,11 @@ lodash.mergewith@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" +lodash.mergewith@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" + integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== + lodash.pick@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" @@ -7405,7 +7420,7 @@ lodash.throttle@^4.0.0, lodash.throttle@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" -lodash@4.17.11, "lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.3.0: +"lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.3.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" @@ -7421,6 +7436,11 @@ lodash@^4.11.1, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.5, lodash@~4.17.10 version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" +lodash@^4.17.15: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"