mergging

1 files changed, 38 insertions, 26 deletions

diff --git a/package.json b/package.json
index 4e1e7583b..d5818a88f 100644
--- a/package.json
+++ b/package.json
@@ -11,27 +11,29 @@
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",
-    "@types/mocha": "^5.2.5",
-    "@types/react-dom": "^16.0.9",
+    "@types/mocha": "^5.2.6",
+    "@types/react-dom": "^16.8.2",
     "@types/webpack-dev-middleware": "^2.0.2",
     "@types/webpack-hot-middleware": "^2.16.4",
     "awesome-typescript-loader": "^5.2.1",
     "chai": "^4.2.0",
     "copy-webpack-plugin": "^4.6.0",
-    "css-loader": "^2.1.0",
+    "css-loader": "^2.1.1",
+    "file-loader": "^3.0.1",
     "mocha": "^5.2.0",
     "sass-loader": "^7.1.0",
     "scss-loader": "0.0.1",
     "style-loader": "^0.23.1",
     "ts-node": "^7.0.1",
-    "typescript": "^3.3.1",
-    "webpack": "^4.29.1",
-    "webpack-cli": "^3.2.1",
-    "webpack-dev-middleware": "^3.5.2",
-    "webpack-dev-server": "^3.1.14",
+    "typescript": "^3.3.3333",
+    "webpack": "^4.29.6",
+    "webpack-cli": "^3.2.3",
+    "webpack-dev-middleware": "^3.6.1",
+    "webpack-dev-server": "^3.2.1",
     "webpack-hot-middleware": "^2.24.3"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-free-solid": "^5.0.13",
     "@fortawesome/fontawesome-svg-core": "^1.2.15",
     "@hig/flyout": "^1.0.3",
     "@fortawesome/free-solid-svg-icons": "^5.7.2",
@@ -44,11 +46,11 @@
     "@types/express-session": "^1.15.12",
     "@types/express-validator": "^3.0.0",
     "@types/jquery": "^3.3.29",
-    "@types/jsonwebtoken": "^8.3.0",
+    "@types/jsonwebtoken": "^8.3.2",
     "@types/lodash": "^4.14.121",
-    "@types/mongodb": "^3.1.19",
-    "@types/mongoose": "^5.3.16",
-    "@types/node": "^10.12.24",
+    "@types/mongodb": "^3.1.22",
+    "@types/mongoose": "^5.3.21",
+    "@types/node": "^10.12.30",
     "@types/passport": "^1.0.0",
     "@types/passport-local": "^1.0.33",
     "@types/prosemirror-commands": "^1.0.1",
@@ -56,18 +58,22 @@
     "@types/prosemirror-keymap": "^1.0.1",
     "@types/prosemirror-model": "^1.7.0",
     "@types/prosemirror-schema-basic": "^1.0.1",
-    "@types/prosemirror-state": "^1.2.1",
+    "@types/prosemirror-schema-list": "^1.0.1",
+    "@types/prosemirror-state": "^1.2.3",
     "@types/prosemirror-transform": "^1.1.0",
-    "@types/prosemirror-view": "^1.3.0",
+    "@types/prosemirror-view": "^1.3.1",
     "@types/pug": "^2.0.4",
+    "@types/react": "^16.8.7",
+    "@types/react-color": "^2.14.1",
     "@types/react-measure": "^2.0.4",
-    "@types/react-table": "^6.7.21",
+    "@types/react-table": "^6.7.22",
     "@types/request": "^2.48.1",
     "@types/socket.io": "^2.1.2",
     "@types/socket.io-client": "^1.4.32",
     "@types/typescript": "^2.0.0",
     "@types/uuid": "^3.4.4",
-    "@types/webpack": "^4.4.24",
+    "@types/webpack": "^4.4.25",
+    "babel-runtime": "^6.26.0",
     "bcrypt-nodejs": "0.0.3",
     "bluebird": "^3.5.3",
     "body-parser": "^1.18.3",
@@ -79,42 +85,48 @@
     "expressjs": "^1.0.1",
     "flexlayout-react": "^0.3.3",
     "golden-layout": "^1.5.9",
+    "html-to-image": "^0.1.0",
     "i": "^0.3.6",
-    "jsonwebtoken": "^8.4.0",
+    "jsonwebtoken": "^8.5.0",
     "jsx-to-string": "^1.4.0",
     "lodash": "^4.17.11",
     "mobx": "^5.9.0",
     "mobx-react": "^5.3.5",
-    "mobx-react-devtools": "^6.0.3",
+    "mobx-react-devtools": "^6.1.1",
     "mongodb": "^3.1.13",
-    "mongoose": "^5.4.12",
+    "mongoose": "^5.4.18",
     "node-sass": "^4.11.0",
     "nodemon": "^1.18.10",
     "normalize.css": "^8.0.1",
-    "npm": "^6.8.0",
+    "npm": "^6.9.0",
     "passport": "^0.4.0",
     "passport-local": "^1.0.0",
     "prosemirror-commands": "^1.0.7",
     "prosemirror-example-setup": "^1.0.1",
-    "prosemirror-history": "^1.0.3",
+    "prosemirror-history": "^1.0.4",
     "prosemirror-keymap": "^1.0.1",
     "prosemirror-model": "^1.7.0",
     "prosemirror-schema-basic": "^1.0.0",
+    "prosemirror-schema-list": "^1.0.2",
     "prosemirror-state": "^1.2.2",
     "prosemirror-transform": "^1.1.3",
-    "prosemirror-view": "^1.7.1",
+    "prosemirror-view": "^1.8.3",
     "pug": "^2.0.3",
     "raw-loader": "^1.0.0",
-    "react": "^16.5.2",
+    "react": "^16.8.4",
+    "react-color": "^2.17.0",
     "react-dimensions": "^1.3.1",
-    "react-dom": "^16.7.0",
+    "react-dom": "^16.8.4",
     "react-golden-layout": "^1.0.6",
     "react-image-lightbox": "^5.1.0",
-    "react-jsx-parser": "^1.13.0",
+    "react-jsx-parser": "^1.14.1",
     "react-measure": "^2.2.4",
     "react-mosaic": "0.0.20",
+    "react-pdf": "^4.0.2",
+    "react-pdf-highlighter": "^2.1.2",
+    "react-pdf-js": "^4.0.2",
     "react-split-pane": "^0.1.85",
-    "react-table": "^6.9.0",
+    "react-table": "^6.9.2",
     "request": "^2.88.0",
     "socket.io": "^2.2.0",
     "socket.io-client": "^2.2.0",