From fa3e6e945b0d69845d6fdfbb4ff181d0d2094353 Mon Sep 17 00:00:00 2001 From: Pierre-Gilles Leymarie Date: Sun, 14 Oct 2018 07:42:59 +0800 Subject: [PATCH] Rolling back bcrypt to 3.0.0 --- package.json | 6 +++--- yarn.lock | 32 ++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 4072d80254..10e9fce9db 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "barrels": "^1.6.5", - "bcrypt": "3.0.1", + "bcrypt": "3.0.0", "bluebird": "^3.5.0", "chrono-node": "^1.3.5", "clone": "^2.1.1", @@ -53,10 +53,10 @@ "sails": "^0.12.13", "sails-mysql": "^0.12.1", "sails-util-mvcsloader": "^0.4.0", + "semver": "^5.6.0", "serialization": "^0.2.0", "suncalc": "^1.8.0", - "uuid": "^3.1.0", - "semver": "^5.6.0" + "uuid": "^3.1.0" }, "devDependencies": { "documentation-flat-theme": "^0.2.1", diff --git a/yarn.lock b/yarn.lock index b40955dbfe..05d21c26ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1228,12 +1228,12 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bcrypt@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-3.0.1.tgz#2ea12883330bf5f81926f70475cf21bdd0c2f8ff" +bcrypt@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-3.0.0.tgz#0cd38983f45143aa5a6122c9660d0b7ec3a33fb0" dependencies: - nan "2.11.0" - node-pre-gyp "0.11.0" + nan "2.10.0" + node-pre-gyp "0.10.2" beeper@^1.1.0: version "1.1.1" @@ -5274,11 +5274,7 @@ mysql@2.10.2: bignumber.js "2.1.4" readable-stream "~1.1.13" -nan@2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099" - -nan@^2.9.2: +nan@2.10.0, nan@^2.9.2: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" @@ -5306,6 +5302,14 @@ ncp@0.4.x, ncp@~0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/ncp/-/ncp-0.4.2.tgz#abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574" +needle@^2.2.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" + dependencies: + debug "^2.1.2" + iconv-lite "^0.4.4" + sax "^1.2.4" + needle@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d" @@ -5333,13 +5337,13 @@ node-fetch@1.6.3: encoding "^0.1.11" is-stream "^1.0.1" -node-pre-gyp@0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" +node-pre-gyp@0.10.2: + version "0.10.2" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz#e8945c20ef6795a20aac2b44f036eb13cf5146e3" dependencies: detect-libc "^1.0.2" mkdirp "^0.5.1" - needle "^2.2.1" + needle "^2.2.0" nopt "^4.0.1" npm-packlist "^1.1.6" npmlog "^4.0.2"