Merge branch 'master' into james-server-stats

1 files changed, 13 insertions, 8 deletions

diff --git a/package.json b/package.json
index 7fa90e431..0f9fc4895 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
         "@types/connect-flash": "0.0.34",
         "@types/cookie-parser": "^1.4.2",
         "@types/cookie-session": "^2.0.44",
+        "@types/d3": "^7.4.0",
         "@types/dotenv": "^6.1.1",
         "@types/exif": "^0.6.3",
         "@types/express": "^4.17.13",
@@ -98,7 +99,7 @@
         "cross-env": "^5.2.1",
         "css-loader": "^2.1.1",
         "dotenv": "^8.6.0",
-        "eslint": "^8.18.0",
+        "eslint": "^8.36.0",
         "eslint-config-airbnb": "^19.0.4",
         "eslint-config-node": "^4.1.0",
         "eslint-config-prettier": "^8.5.0",
@@ -129,11 +130,11 @@
     "dependencies": {
         "@ffmpeg/core": "0.10.0",
         "@ffmpeg/ffmpeg": "0.10.0",
-        "@fortawesome/fontawesome-svg-core": "^1.3.0",
-        "@fortawesome/free-brands-svg-icons": "^5.15.4",
-        "@fortawesome/free-regular-svg-icons": "^5.15.4",
-        "@fortawesome/free-solid-svg-icons": "^5.15.4",
-        "@fortawesome/react-fontawesome": "^0.1.19",
+        "@fortawesome/fontawesome-svg-core": "^6.3.0",
+        "@fortawesome/free-brands-svg-icons": "^6.3.0",
+        "@fortawesome/free-regular-svg-icons": "^6.3.0",
+        "@fortawesome/free-solid-svg-icons": "^6.3.0",
+        "@fortawesome/react-fontawesome": "^0.2.0",
         "@hig/flyout": "^1.3.1",
         "@hig/theme-context": "^2.1.3",
         "@hig/theme-data": "^2.23.1",
@@ -155,7 +156,6 @@
         "@types/three": "^0.126.2",
         "@types/web": "0.0.53",
         "@webscopeio/react-textarea-autocomplete": "^4.9.1",
-        "D": "^1.0.0",
         "adm-zip": "^0.4.16",
         "archiver": "^3.1.1",
         "array-batcher": "^1.2.3",
@@ -169,10 +169,11 @@
         "bluebird": "^3.7.2",
         "body-parser": "^1.19.2",
         "bootstrap": "^4.6.1",
-        "browndash-components": "0.0.22",
+        "browndash-components": "^0.0.28",
         "browser-assert": "^1.2.1",
         "bson": "^4.6.1",
         "canvas": "^2.9.3",
+        "chart.js": "^3.8.0",
         "child_process": "^1.0.2",
         "chrome": "^0.1.0",
         "class-transformer": "^0.2.0",
@@ -186,6 +187,8 @@
         "cors": "^2.8.5",
         "csv-parser": "^3.0.0",
         "csv-stringify": "^6.3.0",
+        "d3": "^7.6.1",
+        "D": "^1.0.0",
         "depcheck": "^0.9.2",
         "equation-editor-react": "github:bobzel/equation-editor-react#useLocally",
         "exif": "^0.6.0",
@@ -272,6 +275,7 @@
         "react-audio-waveform": "0.0.5",
         "react-autosuggest": "^9.4.3",
         "react-beautiful-dnd": "^13.1.0",
+        "react-chartjs-2": "^4.3.0",
         "react-color": "^2.19.3",
         "react-compound-slider": "^2.5.0",
         "react-datepicker": "^3.8.0",
@@ -290,6 +294,7 @@
         "react-table": "^6.11.5",
         "react-transition-group": "^4.4.2",
         "readline": "^1.3.0",
+        "recharts": "^2.1.12",
         "rehype-raw": "^6.1.1",
         "remark-gfm": "^3.0.1",
         "request": "^2.88.2",