merged master

1 files changed, 37 insertions, 22 deletions

diff --git a/package.json b/package.json
index 0b9f20529..87cd1c074 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
         "@types/exif": "^0.6.3",
         "@types/express": "^4.17.13",
         "@types/express-flash": "0.0.0",
-        "@types/express-session": "^1.17.4",
+        "@types/express-session": "^1.17.5",
         "@types/express-validator": "^3.0.0",
         "@types/file-saver": "^2.0.5",
         "@types/google-maps-react": "^2.0.5",
@@ -49,7 +49,7 @@
         "@types/mongoose": "^5.11.97",
         "@types/node": "^10.17.60",
         "@types/nodemailer": "^4.6.6",
-        "@types/passport": "^1.0.7",
+        "@types/passport": "^1.0.9",
         "@types/passport-google-oauth20": "^2.0.11",
         "@types/passport-local": "^1.0.34",
         "@types/pdfjs-dist": "^2.10.378",
@@ -65,12 +65,15 @@
         "@types/prosemirror-transform": "^1.1.5",
         "@types/prosemirror-view": "^1.23.1",
         "@types/rc-switch": "^1.9.2",
-        "@types/react": "^16.14.23",
+        "@types/react": "^18.0.15",
+        "@types/react-icons": "^3.0.0",
+        "@types/react-reconciler": "^0.26.4",
+        "@types/react-transition-group": "^4.4.5",
         "@types/react-autosuggest": "^9.3.14",
         "@types/react-color": "^2.17.6",
         "@types/react-datepicker": "^3.1.8",
-        "@types/react-dom": "^16.9.14",
-        "@types/react-grid-layout": "^0.17.2",
+        "@types/react-dom": "^18.0.6",
+        "@types/react-grid-layout": "^1.3.2",
         "@types/react-measure": "^2.0.8",
         "@types/react-select": "^3.1.2",
         "@types/react-table": "^6.8.9",
@@ -94,10 +97,21 @@
         "cross-env": "^5.2.1",
         "css-loader": "^2.1.1",
         "dotenv": "^8.6.0",
+        "eslint": "^8.18.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-node": "^4.1.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jsx-a11y": "^6.6.0",
+        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "eslint-plugin-react": "^7.30.1",
+        "eslint-plugin-react-hooks": "^4.6.0",
         "file-loader": "^3.0.1",
         "fork-ts-checker-webpack-plugin": "^1.6.0",
         "jsdom": "^15.2.1",
         "mocha": "^5.2.0",
+        "prettier": "^2.7.1",
         "sass-loader": "^7.3.1",
         "scss-loader": "0.0.1",
         "style-loader": "^0.23.1",
@@ -106,7 +120,7 @@
         "ts-node-dev": "^1.1.8",
         "tslint": "^5.20.1",
         "tslint-loader": "^3.6.0",
-        "typescript": "^4.6.2",
+        "typescript": "^4.7.4",
         "webpack": "^5.69.1",
         "webpack-dev-server": "^3.11.3",
         "webpack-hot-middleware": "^2.25.1"
@@ -118,7 +132,7 @@
         "@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.17",
+        "@fortawesome/react-fontawesome": "^0.1.19",
         "@hig/flyout": "^1.3.1",
         "@hig/theme-context": "^2.1.3",
         "@hig/theme-data": "^2.23.1",
@@ -134,13 +148,10 @@
         "@types/dom-speech-recognition": "0.0.1",
         "@types/formidable": "1.0.31",
         "@types/google-maps": "^3.2.3",
-        "@types/react-icons": "^3.0.0",
-        "@types/react-reconciler": "^0.26.4",
         "@types/reveal": "^3.3.33",
         "@types/supercluster": "^7.1.0",
         "@types/three": "^0.126.2",
         "@types/web": "0.0.53",
-        "@types/webscopeio__react-textarea-autocomplete": "^4.7.2",
         "@webscopeio/react-textarea-autocomplete": "^4.9.1",
         "D": "^1.0.0",
         "adm-zip": "^0.4.16",
@@ -157,8 +168,12 @@
         "bootstrap": "^4.6.1",
         "browser-assert": "^1.2.1",
         "bson": "^4.6.1",
+<<<<<<< HEAD
         "canvas": "^2.9.0",
         "chart.js": "^3.8.0",
+=======
+        "canvas": "^2.9.3",
+>>>>>>> master
         "child_process": "^1.0.2",
         "chrome": "^0.1.0",
         "class-transformer": "^0.2.0",
@@ -231,7 +246,7 @@
         "path-browserify": "^1.0.1",
         "pdf-parse": "^1.1.1",
         "pdfjs": "^2.4.7",
-        "pdfjs-dist": "^2.13.216",
+        "pdfjs-dist": "^2.14.305",
         "probe-image-size": "^4.0.0",
         "process": "^0.11.10",
         "prosemirror-commands": "^1.2.1",
@@ -240,17 +255,17 @@
         "prosemirror-history": "^1.2.0",
         "prosemirror-inputrules": "^1.1.3",
         "prosemirror-keymap": "^1.1.5",
-        "prosemirror-model": "^1.16.1",
+        "prosemirror-model": "^1.18.1",
         "prosemirror-schema-list": "^1.1.6",
-        "prosemirror-state": "^1.3.4",
+        "prosemirror-state": "^1.4.1",
         "prosemirror-transform": "^1.3.4",
-        "prosemirror-view": "^1.23.7",
+        "prosemirror-view": "^1.26.5",
         "pug": "^2.0.4",
         "puppeteer": "^3.3.0",
         "query-string": "^6.14.1",
         "raw-loader": "^1.0.0",
         "rc-switch": "^1.9.2",
-        "react": "^16.14.0",
+        "react": "^18.2.0",
         "react-audio-waveform": "0.0.5",
         "react-autosuggest": "^9.4.3",
         "react-beautiful-dnd": "^13.1.0",
@@ -258,19 +273,19 @@
         "react-color": "^2.19.3",
         "react-compound-slider": "^2.5.0",
         "react-datepicker": "^3.8.0",
-        "react-dom": "^16.14.0",
-        "react-grid-layout": "^0.18.3",
+        "react-dom": "^18.2.0",
+        "react-grid-layout": "^1.3.4",
         "react-icons": "^4.3.1",
-        "react-image-lightbox-with-rotate": "^5.1.1",
         "react-jsx-parser": "^1.29.0",
         "react-loading": "^2.0.3",
         "react-measure": "^2.5.2",
-        "react-refresh-typescript": "^2.0.3",
+        "react-refresh-typescript": "^2.0.7",
         "react-resizable": "^1.11.1",
         "react-resizable-rotatable-draggable": "^0.2.0",
         "react-reveal": "^1.2.2",
         "react-select": "^3.2.0",
         "react-table": "^6.11.5",
+        "react-transition-group": "^4.4.2",
         "readline": "^1.3.0",
         "request": "^2.88.2",
         "request-promise": "^4.2.6",
@@ -279,8 +294,8 @@
         "serializr": "^1.5.4",
         "sharp": "^0.23.4",
         "shelljs": "^0.8.5",
-        "socket.io": "^2.4.1",
-        "socket.io-client": "^2.4.0",
+        "socket.io": "^2.5.0",
+        "socket.io-client": "^2.5.0",
         "solr-node": "^1.2.1",
         "standard-http-error": "^2.0.1",
         "stream-browserify": "^3.0.0",
@@ -297,7 +312,7 @@
         "uuid": "^3.4.0",
         "valid-url": "^1.0.9",
         "web-request": "^1.0.7",
-        "webpack-cli": "^4.9.2",
+        "webpack-cli": "^4.10.0",
         "webpack-dev-middleware": "^5.3.1",
         "webrtc-adapter": "^7.7.1",
         "wikijs": "^6.3.3",