From 117167b39d6355382a4f2d3338367289774035ca Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Tue, 20 Oct 2020 00:33:53 +0000
Subject: [PATCH] fix: package.json & package-lock.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-CHARTJS-1018716
---
 package-lock.json | 66 ++++++++++++++++++++++++++++++++++++-----------
 package.json      |  2 +-
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bad6d31ef7f2..3a92920e5b91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "Rocket.Chat",
-	"version": "2.4.0-develop",
+	"version": "2.5.0-develop",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -12105,27 +12105,27 @@
 			"dev": true
 		},
 		"chart.js": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.3.tgz",
-			"integrity": "sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==",
+			"version": "2.9.4",
+			"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
+			"integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
 			"requires": {
 				"chartjs-color": "^2.1.0",
 				"moment": "^2.10.2"
 			}
 		},
 		"chartjs-color": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz",
-			"integrity": "sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=",
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
+			"integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
 			"requires": {
-				"chartjs-color-string": "^0.5.0",
-				"color-convert": "^0.5.3"
+				"chartjs-color-string": "^0.6.0",
+				"color-convert": "^1.9.3"
 			}
 		},
 		"chartjs-color-string": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz",
-			"integrity": "sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+			"integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
 			"requires": {
 				"color-name": "^1.0.0"
 			}
@@ -12758,9 +12758,19 @@
 			}
 		},
 		"color-convert": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
-			"integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"requires": {
+				"color-name": "1.1.3"
+			},
+			"dependencies": {
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+				}
+			}
 		},
 		"color-name": {
 			"version": "1.1.4",
@@ -19039,6 +19049,18 @@
 						"hoek": "2.x.x",
 						"joi": "6.x.x",
 						"wreck": "5.x.x"
+					},
+					"dependencies": {
+						"wreck": {
+							"version": "5.6.1",
+							"resolved": "https://registry.npmjs.org/wreck/-/wreck-5.6.1.tgz",
+							"integrity": "sha1-r/ADBAATiJ11YZtccYcN0qjdBpo=",
+							"dev": true,
+							"requires": {
+								"boom": "2.x.x",
+								"hoek": "2.x.x"
+							}
+						}
 					}
 				},
 				"heavy": {
@@ -19050,6 +19072,20 @@
 						"boom": "2.x.x",
 						"hoek": "2.x.x",
 						"joi": "5.x.x"
+					},
+					"dependencies": {
+						"joi": {
+							"version": "5.1.0",
+							"resolved": "https://registry.npmjs.org/joi/-/joi-5.1.0.tgz",
+							"integrity": "sha1-FSrQfbjunGQBmX/1/SwSiWBwv1g=",
+							"dev": true,
+							"requires": {
+								"hoek": "^2.2.x",
+								"isemail": "1.x.x",
+								"moment": "2.x.x",
+								"topo": "1.x.x"
+							}
+						}
 					}
 				},
 				"hoek": {
diff --git a/package.json b/package.json
index 82625d5d864d..7a7460b44732 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
 		"busboy": "^0.2.14",
 		"bytebuffer": "5.0.1",
 		"cas": "https://github.com/kcbanner/node-cas/tarball/fcd27dad333223b3b75a048bce27973fb3ca0f62",
-		"chart.js": "^2.7.3",
+		"chart.js": "^2.9.4",
 		"clipboard": "^2.0.4",
 		"codemirror": "^5.42.0",
 		"coffeescript": "^2.3.2",