Merge pull request #1322 from ever-co/develop

Release
ever-co · Oct 27, 2020 · 7985278 · 7985278
2 parents d72cd6d + c62278a
commit 7985278
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -66,7 +66,7 @@
 		"@nestjs/websockets": "^7.0.9",
 		"apollo-server-express": "^2.8.0",
 		"axios": "^0.19.0",
-		"bcrypt": "^3.0.6",
+		"bcrypt": "5.0.0",
 		"bluebird": "^3.5.5",
 		"body-parser": "^1.19.0",
 		"bunyan": "^1.8.12",
@@ -147,7 +147,6 @@
 		"ws": "^7.1.1"
 	},
 	"devDependencies": {
-		"@types/node": "12.11.1",
 		"@types/bcrypt": "^3.0.0",
 		"@types/bluebird": "^3.5.30",
 		"@types/body-parser": "^1.17.0",
@@ -172,6 +171,7 @@
 		"@types/moment": "^2.13.0",
 		"@types/mongodb": "^3.3.11",
 		"@types/mongoose": "^5.5.32",
+		"@types/node": "12.11.1",
 		"@types/passport": "^1.0.3",
 		"@types/passport-jwt": "^3.0.1",
 		"@types/redis": "^2.8.13",
@@ -181,9 +181,9 @@
 		"@types/sinon": "^7.0.13",
 		"@types/socket.io": "^2.1.4",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/uuid": "^3.4.4",
 		"@types/source-map-support": "^0.5.0",
 		"@types/stripe": "^7.13.9",
+		"@types/uuid": "^3.4.4",
 		"@types/ws": "^6.0.1",
 		"ts-node": "~8.3.0",
 		"tslint": "^6.1.1",

diff --git a/yarn.lock b/yarn.lock
@@ -2046,7 +2046,7 @@
     "@angular/platform-browser-dynamic" "^9.1.0"
     "@angular/router" "^9.1.0"
     "@angular/service-worker" "^9.1.0"
-    "@ever-platform/common" "file:../../../Users/evere/AppData/Local/Yarn/Cache/v6/npm-@ever-platform-common-angular-0.3.6-7f01a7f5-320a-4160-8ced-ba424763f993-1601884829956/node_modules/@ever-platform/common"
+    "@ever-platform/common" "file:packages/common"
     "@ngx-translate/core" "^12.1.2"
     "@ngx-translate/http-loader" "^4.0.0"
     tslib "^1.10.0"
@@ -14283,9 +14283,9 @@ eventemitter3@^3.1.0:
   integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
 eventemitter3@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
-  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@1.1.1:
   version "1.1.1"
@@ -15234,11 +15234,9 @@ follow-redirects@1.5.10:
     debug "=3.1.0"
 
 follow-redirects@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
-  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
-  dependencies:
-    debug "^3.0.0"
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
+  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -17469,9 +17467,9 @@ http-proxy-middleware@0.19.1:
     micromatch "^3.1.10"
 
 http-proxy@^1.13.0, http-proxy@^1.17.0, http-proxy@^1.8.1:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
-  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
     eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"