Merge branch 'master' into data-visualization-view-naafi

1 files changed, 20 insertions, 11 deletions

diff --git a/package.json b/package.json
index 4a61f09a9..7bde4d194 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
         "child_process": "empty"
     },
     "scripts": {
-        "start-release": "cross-env RELEASE=true NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --debug -- src/server/index.ts",
+        "start-release": "cross-env RELEASE=true NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev -- src/server/index.ts",
         "start": "cross-env NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --debug --transpile-only -- src/server/index.ts",
         "oldstart": "cross-env NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --debug -- src/server/index.ts",
         "debug": "cross-env NODE_OPTIONS=--max_old_space_size=8192 ts-node-dev --transpile-only --inspect -- src/server/index.ts",
@@ -85,6 +85,7 @@
         "@types/shelljs": "^0.8.11",
         "@types/socket.io": "^2.1.13",
         "@types/socket.io-client": "^1.4.36",
+        "@types/socket.io-parser": "^3.0.0",
         "@types/typescript": "^2.0.0",
         "@types/uuid": "^3.4.10",
         "@types/valid-url": "^1.0.3",
@@ -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",
@@ -117,8 +118,8 @@
         "scss-loader": "0.0.1",
         "style-loader": "^0.23.1",
         "ts-loader": "^5.3.3",
-        "ts-node": "^7.0.1",
-        "ts-node-dev": "^1.1.8",
+        "ts-node": "^10.9.1",
+        "ts-node-dev": "^2.0.0",
         "tslint": "^5.20.1",
         "tslint-loader": "^3.6.0",
         "typescript": "^4.7.4",
@@ -129,15 +130,16 @@
     "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",
         "@material-ui/core": "^4.12.3",
+        "@octokit/core": "^4.0.4",
         "@react-google-maps/api": "^2.7.0",
         "@react-three/fiber": "^6.2.3",
         "@types/bezier-js": "^4.1.0",
@@ -154,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",
@@ -164,9 +165,11 @@
         "bcrypt-nodejs": "0.0.3",
         "bezier-curve": "^1.0.0",
         "bezier-js": "^4.1.1",
+        "bingmaps-react": "^1.2.10",
         "bluebird": "^3.7.2",
         "body-parser": "^1.19.2",
         "bootstrap": "^4.6.1",
+        "browndash-components": "^0.0.28",
         "browser-assert": "^1.2.1",
         "bson": "^4.6.1",
         "canvas": "^2.9.3",
@@ -180,8 +183,10 @@
         "connect-mongo": "^2.0.3",
         "cookie-parser": "^1.4.6",
         "cookie-session": "^2.0.0",
+        "core-js": "^3.28.0",
         "cors": "^2.8.5",
         "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",
@@ -223,6 +228,7 @@
         "jszip": "^3.7.1",
         "lodash": "^4.17.21",
         "material-ui": "^0.20.2",
+        "md5-file": "^5.0.0",
         "memorystream": "^0.3.1",
         "mobile-detect": "^1.4.5",
         "mobx": "^5.15.7",
@@ -236,7 +242,7 @@
         "nodemailer": "^5.1.1",
         "nodemon": "^1.19.4",
         "normalize.css": "^8.0.1",
-        "npm": "^6.14.16",
+        "npm": "^6.14.18",
         "p-limit": "^2.2.0",
         "passport": "^0.4.0",
         "passport-google-oauth20": "^2.0.0",
@@ -276,6 +282,7 @@
         "react-icons": "^4.3.1",
         "react-jsx-parser": "^1.29.0",
         "react-loading": "^2.0.3",
+        "react-markdown": "^8.0.3",
         "react-measure": "^2.5.2",
         "react-refresh-typescript": "^2.0.7",
         "react-resizable": "^1.11.1",
@@ -286,6 +293,8 @@
         "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",
         "request-promise": "^4.2.6",
         "reveal.js": "^4.3.0",