merge from master

1 files changed, 25 insertions, 8 deletions

diff --git a/package.json b/package.json
index 4999b4c6a..09e439c19 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,9 @@
     "description": "",
     "main": "index.js",
     "scripts": {
-        "start": "ts-node-dev -- src/server/index.ts",
-        "debug": "ts-node-dev --inspect -- src/server/index.ts",
-        "build": "webpack --env production",
+        "start": "cross-env NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev -- src/server/index.ts",
+        "debug": "cross-env NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --inspect -- src/server/index.ts",
+        "build": "cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --env production",
         "test": "mocha -r ts-node/register test/**/*.ts",
         "tsc": "tsc"
     },
@@ -19,6 +19,7 @@
         "awesome-typescript-loader": "^5.2.1",
         "chai": "^4.2.0",
         "copy-webpack-plugin": "^4.6.0",
+        "cross-env": "^5.2.0",
         "css-loader": "^2.1.1",
         "file-loader": "^3.0.1",
         "fork-ts-checker-webpack-plugin": "^1.0.2",
@@ -32,7 +33,7 @@
         "ts-node-dev": "^1.0.0-pre.32",
         "tslint": "^5.15.0",
         "tslint-loader": "^3.5.4",
-        "typescript": "^3.4.1",
+        "typescript": "^3.5.3",
         "webpack": "^4.29.6",
         "webpack-cli": "^3.2.3",
         "webpack-dev-middleware": "^3.6.1",
@@ -42,31 +43,37 @@
     "dependencies": {
         "@fortawesome/fontawesome-free-solid": "^5.0.13",
         "@fortawesome/fontawesome-svg-core": "^1.2.15",
+        "@fortawesome/free-brands-svg-icons": "^5.9.0",
+        "@fortawesome/free-regular-svg-icons": "^5.9.0",
         "@fortawesome/free-solid-svg-icons": "^5.7.2",
         "@fortawesome/react-fontawesome": "^0.1.4",
         "@hig/flyout": "^1.0.3",
         "@hig/theme-context": "^2.1.3",
         "@hig/theme-data": "^2.3.3",
         "@trendmicro/react-dropdown": "^1.3.0",
+        "@types/animejs": "^2.0.2",
         "@types/async": "^2.4.1",
         "@types/bcrypt-nodejs": "0.0.30",
         "@types/bluebird": "^3.5.25",
         "@types/body-parser": "^1.17.0",
+        "@types/classnames": "^2.2.8",
         "@types/connect-flash": "0.0.34",
         "@types/cookie-parser": "^1.4.1",
         "@types/cookie-session": "^2.0.36",
         "@types/d3-format": "^1.3.1",
+        "@types/dotenv": "^6.1.1",
         "@types/express": "^4.16.1",
         "@types/express-flash": "0.0.0",
         "@types/express-session": "^1.15.12",
         "@types/express-validator": "^3.0.0",
         "@types/formidable": "^1.0.31",
         "@types/jquery": "^3.3.29",
+        "@types/jquery-awesome-cursor": "^0.3.0",
         "@types/jsonwebtoken": "^8.3.2",
         "@types/lodash": "^4.14.121",
         "@types/mobile-detect": "^1.3.4",
         "@types/mongodb": "^3.1.22",
-        "@types/mongoose": "^5.3.21",
+        "@types/mongoose": "^5.5.8",
         "@types/node": "^10.12.30",
         "@types/nodemailer": "^4.6.6",
         "@types/passport": "^1.0.0",
@@ -85,6 +92,7 @@
         "@types/prosemirror-view": "^1.3.1",
         "@types/pug": "^2.0.4",
         "@types/react": "^16.8.7",
+        "@types/react-autosuggest": "^9.3.9",
         "@types/react-color": "^2.14.1",
         "@types/react-measure": "^2.0.4",
         "@types/react-table": "^6.7.22",
@@ -96,6 +104,7 @@
         "@types/typescript": "^2.0.0",
         "@types/uuid": "^3.4.4",
         "@types/webpack": "^4.4.25",
+        "@types/youtube": "0.0.38",
         "async": "^2.6.2",
         "babel-runtime": "^6.26.0",
         "bcrypt-nodejs": "0.0.3",
@@ -110,6 +119,7 @@
         "cookie-session": "^2.0.0-beta.3",
         "crypto-browserify": "^3.11.0",
         "d3-format": "^1.3.2",
+        "dotenv": "^8.0.0",
         "express": "^4.16.4",
         "express-flash": "0.0.2",
         "express-session": "^1.15.6",
@@ -119,10 +129,13 @@
         "font-awesome": "^4.7.0",
         "formidable": "^1.2.1",
         "golden-layout": "^1.5.9",
+        "howler": "^2.1.2",
         "html-to-image": "^0.1.0",
         "i": "^0.3.6",
         "image-data-uri": "^2.0.0",
+        "image-size": "^0.7.4",
         "imagesloaded": "^4.1.4",
+        "jquery-awesome-cursor": "^0.3.1",
         "jsonwebtoken": "^8.5.0",
         "jsx-to-string": "^1.4.0",
         "lodash": "^4.17.11",
@@ -132,7 +145,7 @@
         "mobx-react-devtools": "^6.1.1",
         "mobx-utils": "^5.4.0",
         "mongodb": "^3.1.13",
-        "mongoose": "^5.4.18",
+        "mongoose": "^5.6.4",
         "node-sass": "^4.12.0",
         "nodemailer": "^5.1.1",
         "nodemon": "^1.18.10",
@@ -154,8 +167,11 @@
         "prosemirror-transform": "^1.1.3",
         "prosemirror-view": "^1.8.3",
         "pug": "^2.0.3",
+        "query-string": "^6.8.1",
         "raw-loader": "^1.0.0",
         "react": "^16.8.4",
+        "react-anime": "^2.2.0",
+        "react-autosuggest": "^9.4.3",
         "react-bootstrap": "^1.0.0-beta.5",
         "react-bootstrap-dropdown-menu": "^1.1.15",
         "react-color": "^2.17.0",
@@ -173,7 +189,6 @@
         "react-split-pane": "^0.1.85",
         "react-table": "^6.9.2",
         "request": "^2.88.0",
-        "request-image-size": "^2.1.0",
         "request-promise": "^4.2.4",
         "serializr": "^1.5.1",
         "sharp": "^0.22.1",
@@ -181,9 +196,11 @@
         "socket.io-client": "^2.2.0",
         "solr-node": "^1.1.3",
         "tiny-timer": "^1.3.0",
+        "standard-http-error": "^2.0.1",
         "typescript-collections": "^1.3.2",
         "url-loader": "^1.1.2",
         "uuid": "^3.3.2",
-        "xoauth2": "^1.2.0"
+        "xoauth2": "^1.2.0",
+        "youtube": "^0.1.0"
     }
 }