summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-08-24 09:52:50 +0300
committerLauri Ojansivu <x@xet7.org>2020-08-24 09:52:50 +0300
commite17e8d41542e4fd872c725e62b346ce1ad08808f (patch)
treeb7080d18618374242eee74d5dec739f1bfa7bf13
parent79f4e2ad6d7791cac4b2edb42591059a1e652350 (diff)
parentdee7020a5aaa90c8580ef42fa73aff0ca4ae3e12 (diff)
downloadwekan-e17e8d41542e4fd872c725e62b346ce1ad08808f.tar.gz
wekan-e17e8d41542e4fd872c725e62b346ce1ad08808f.tar.bz2
wekan-e17e8d41542e4fd872c725e62b346ce1ad08808f.zip
Merge branch 'dependabot/npm_and_yarn/bcrypt-5.0.0'
-rw-r--r--package-lock.json28
-rw-r--r--package.json2
2 files changed, 18 insertions, 12 deletions
diff --git a/package-lock.json b/package-lock.json
index b2dfecb4..5777408e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1013,12 +1013,12 @@
"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
},
"bcrypt": {
- "version": "3.0.8",
- "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.8.tgz",
- "integrity": "sha512-jKV6RvLhI36TQnPDvUFqBEnGX9c8dRRygKxCZu7E+MgLfKZbmmXL8a7/SFFOyHoPNX9nV81cKRC5tbQfvEQtpw==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz",
+ "integrity": "sha512-jB0yCBl4W/kVHM2whjfyqnxTmOHkCX4kHEa5nYKSoGeYe8YrjTYTc87/6bwt1g8cmV0QrbhKriETg9jWtcREhg==",
"requires": {
- "nan": "2.14.0",
- "node-pre-gyp": "0.14.0"
+ "node-addon-api": "^3.0.0",
+ "node-pre-gyp": "0.15.0"
}
},
"bl": {
@@ -3925,7 +3925,8 @@
"nan": {
"version": "2.14.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
- "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+ "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+ "optional": true
},
"nanomatch": {
"version": "1.2.13",
@@ -3984,14 +3985,19 @@
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
"dev": true
},
+ "node-addon-api": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz",
+ "integrity": "sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg=="
+ },
"node-pre-gyp": {
- "version": "0.14.0",
- "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz",
- "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==",
+ "version": "0.15.0",
+ "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz",
+ "integrity": "sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==",
"requires": {
"detect-libc": "^1.0.2",
- "mkdirp": "^0.5.1",
- "needle": "^2.2.1",
+ "mkdirp": "^0.5.3",
+ "needle": "^2.5.0",
"nopt": "^4.0.1",
"npm-packlist": "^1.1.6",
"npmlog": "^4.0.2",
diff --git a/package.json b/package.json
index 30b1891c..e20ed0a3 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
"@root/request": "^1.6.1",
"ajv": "^5.0.0",
"babel-runtime": "^6.26.0",
- "bcrypt": "^3.0.7",
+ "bcrypt": "^5.0.0",
"bson": "^4.0.3",
"bunyan": "^1.8.12",
"es6-promise": "^4.2.4",