Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into PDFNode

1 files changed, 58 insertions, 5 deletions

diff --git a/package.json b/package.json
index c102781d4..7112d3672 100644
--- a/package.json
+++ b/package.json
@@ -4,14 +4,17 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "webpack-dev-server --mode development --color --progress --inline --hot --env development",
+    "start": "nodemon --watch src/server/**/*.ts --exec ts-node src/server/index.ts",
     "build": "webpack --env production",
-    "test": "mocha -r ts-node/register test/**/*.ts"
+    "test": "mocha -r ts-node/register test/**/*.ts",
+    "tsc": "tsc"
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.5",
     "@types/react-dom": "^16.0.9",
+    "@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",
@@ -25,11 +28,29 @@
     "typescript": "^3.3.1",
     "webpack": "^4.29.1",
     "webpack-cli": "^3.2.1",
-    "webpack-dev-server": "^3.1.14"
+    "webpack-dev-middleware": "^3.5.2",
+    "webpack-dev-server": "^3.1.14",
+    "webpack-hot-middleware": "^2.24.3"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.14",
+    "@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",
+    "@types/express": "^4.16.1",
+    "@types/express-flash": "0.0.0",
+    "@types/express-session": "^1.15.12",
+    "@types/express-validator": "^3.0.0",
     "@types/jquery": "^3.3.29",
+    "@types/jsonwebtoken": "^8.3.0",
+    "@types/lodash": "^4.14.121",
+    "@types/mongodb": "^3.1.19",
+    "@types/mongoose": "^5.3.16",
+    "@types/node": "^10.12.24",
+    "@types/passport": "^1.0.0",
+    "@types/passport-local": "^1.0.33",
     "@types/prosemirror-commands": "^1.0.1",
     "@types/prosemirror-history": "^1.0.1",
     "@types/prosemirror-keymap": "^1.0.1",
@@ -38,19 +59,44 @@
     "@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-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",
     "babel-runtime": "^6.26.0",
+    "@types/webpack": "^4.4.24",
+    "bcrypt-nodejs": "0.0.3",
+    "bluebird": "^3.5.3",
+    "body-parser": "^1.18.3",
+    "connect-mongo": "^2.0.3",
+    "express": "^4.16.4",
+    "express-flash": "0.0.2",
+    "express-session": "^1.15.6",
+    "express-validator": "^5.3.1",
+    "expressjs": "^1.0.1",
     "flexlayout-react": "^0.3.3",
     "golden-layout": "^1.5.9",
+    "i": "^0.3.6",
+    "jsonwebtoken": "^8.4.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",
+    "mongodb": "^3.1.13",
+    "mongoose": "^5.4.12",
     "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",
@@ -58,17 +104,24 @@
     "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-dimensions": "^1.3.1",
     "react-dom": "^16.7.0",
     "react-golden-layout": "^1.0.6",
     "react-image-lightbox": "^5.1.0",
     "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",
     "uuid": "^3.3.2"
   }