finally merged

1 files changed, 21 insertions, 3 deletions

diff --git a/package.json b/package.json
index 32567b121..f20f9d427 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "chai": "^4.2.0",
     "copy-webpack-plugin": "^4.6.0",
     "css-loader": "^2.1.0",
+    "file-loader": "^3.0.1",
     "mocha": "^5.2.0",
     "sass-loader": "^7.1.0",
     "scss-loader": "0.0.1",
@@ -32,7 +33,10 @@
     "webpack-hot-middleware": "^2.24.3"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.14",
+    "@fortawesome/fontawesome-free-solid": "^5.0.13",
+    "@fortawesome/fontawesome-svg-core": "^1.2.15",
+    "@fortawesome/free-solid-svg-icons": "^5.7.2",
+    "@fortawesome/react-fontawesome": "^0.1.4",
     "@types/bcrypt-nodejs": "0.0.30",
     "@types/bluebird": "^3.5.25",
     "@types/body-parser": "^1.17.0",
@@ -53,17 +57,21 @@
     "@types/prosemirror-keymap": "^1.0.1",
     "@types/prosemirror-model": "^1.7.0",
     "@types/prosemirror-schema-basic": "^1.0.1",
+    "@types/prosemirror-schema-list": "^1.0.1",
     "@types/prosemirror-state": "^1.2.1",
     "@types/prosemirror-transform": "^1.1.0",
     "@types/prosemirror-view": "^1.3.0",
     "@types/pug": "^2.0.4",
+    "@types/react-color": "^2.14.1",
     "@types/react-measure": "^2.0.4",
     "@types/react-table": "^6.7.21",
+    "@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",
+    "babel-runtime": "^6.26.0",
     "bcrypt-nodejs": "0.0.3",
     "bluebird": "^3.5.3",
     "body-parser": "^1.18.3",
@@ -75,9 +83,11 @@
     "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",
-    "lodash": "^4.17.11",
     "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",
@@ -86,19 +96,23 @@
     "node-sass": "^4.11.0",
     "nodemon": "^1.18.10",
     "normalize.css": "^8.0.1",
-    "npm": "^6.7.0",
+    "npm": "^6.8.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-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",
     "pug": "^2.0.3",
+    "raw-loader": "^1.0.0",
     "react": "^16.5.2",
+    "react-color": "^2.17.0",
     "react-dimensions": "^1.3.1",
     "react-dom": "^16.7.0",
     "react-golden-layout": "^1.0.6",
@@ -106,8 +120,12 @@
     "react-jsx-parser": "^1.13.0",
     "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",
+    "request": "^2.88.0",
     "socket.io": "^2.2.0",
     "socket.io-client": "^2.2.0",
     "url-loader": "^1.1.2",