Merge branch 'master' into presentation_f

1 files changed, 20 insertions, 5 deletions

diff --git a/package.json b/package.json
index 37052fde3..a4343982e 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
     "main": "index.js",
     "scripts": {
         "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",
+        "debug": "cross-env NODE_OPTIONS=--max_old_space_size=8192 ts-node-dev --inspect -- src/server/index.ts",
+        "build": "cross-env NODE_OPTIONS=--max_old_space_size=8192 webpack --env production",
         "test": "mocha -r ts-node/register test/**/*.ts",
         "tsc": "tsc"
     },
@@ -51,7 +51,9 @@
         "@hig/theme-context": "^2.1.3",
         "@hig/theme-data": "^2.3.3",
         "@trendmicro/react-dropdown": "^1.3.0",
+        "@types/adm-zip": "^0.4.32",
         "@types/animejs": "^2.0.2",
+        "@types/archiver": "^3.0.0",
         "@types/async": "^2.4.1",
         "@types/bcrypt-nodejs": "0.0.30",
         "@types/bluebird": "^3.5.25",
@@ -91,6 +93,7 @@
         "@types/prosemirror-transform": "^1.1.0",
         "@types/prosemirror-view": "^1.3.1",
         "@types/pug": "^2.0.4",
+        "@types/rc-switch": "^1.8.0",
         "@types/react": "^16.8.7",
         "@types/react-autosuggest": "^9.3.9",
         "@types/react-color": "^2.14.1",
@@ -99,12 +102,15 @@
         "@types/request": "^2.48.1",
         "@types/request-promise": "^4.1.42",
         "@types/sharp": "^0.22.2",
+        "@types/shelljs": "^0.8.5",
         "@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.25",
         "@types/youtube": "0.0.38",
+        "adm-zip": "^0.4.13",
+        "archiver": "^3.0.3",
         "async": "^2.6.2",
         "babel-runtime": "^6.26.0",
         "bcrypt-nodejs": "0.0.3",
@@ -112,6 +118,7 @@
         "body-parser": "^1.18.3",
         "bootstrap": "^4.3.1",
         "canvas": "^2.5.0",
+        "child_process": "^1.0.2",
         "class-transformer": "^0.2.0",
         "connect-flash": "^0.1.1",
         "connect-mongo": "^2.0.3",
@@ -129,6 +136,8 @@
         "font-awesome": "^4.7.0",
         "formidable": "^1.2.1",
         "golden-layout": "^1.5.9",
+        "google-auth-library": "^4.2.4",
+        "googleapis": "^40.0.0",
         "howler": "^2.1.2",
         "html-to-image": "^0.1.0",
         "i": "^0.3.6",
@@ -139,7 +148,7 @@
         "js-datepicker": "^4.6.6",
         "jsonwebtoken": "^8.5.0",
         "jsx-to-string": "^1.4.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.15",
         "mobile-detect": "^1.4.3",
         "mobx": "^5.9.0",
         "mobx-react": "^5.3.5",
@@ -151,14 +160,16 @@
         "nodemailer": "^5.1.1",
         "nodemon": "^1.18.10",
         "normalize.css": "^8.0.1",
-        "npm": "^6.9.0",
+        "npm": "^6.10.3",
         "p-limit": "^2.2.0",
         "passport": "^0.4.0",
         "passport-local": "^1.0.0",
         "pdfjs-dist": "^2.0.943",
         "probe-image-size": "^4.0.0",
+        "prosemirror": "^0.11.1",
         "prosemirror-commands": "^1.0.7",
         "prosemirror-example-setup": "^1.0.1",
+        "prosemirror-find-replace": "^0.9.0",
         "prosemirror-history": "^1.0.4",
         "prosemirror-keymap": "^1.0.1",
         "prosemirror-model": "^1.7.0",
@@ -170,6 +181,7 @@
         "pug": "^2.0.3",
         "query-string": "^6.8.1",
         "raw-loader": "^1.0.0",
+        "rc-switch": "^1.9.0",
         "react": "^16.8.4",
         "react-anime": "^2.2.0",
         "react-autosuggest": "^9.4.3",
@@ -189,17 +201,20 @@
         "react-simple-dropdown": "^3.2.3",
         "react-split-pane": "^0.1.85",
         "react-table": "^6.9.2",
+        "readline": "^1.3.0",
         "request": "^2.88.0",
         "request-promise": "^4.2.4",
         "serializr": "^1.5.1",
         "sharp": "^0.22.1",
+        "shelljs": "^0.8.3",
         "socket.io": "^2.2.0",
         "socket.io-client": "^2.2.0",
-        "solr-node": "^1.1.3",
+        "solr-node": "^1.2.1",
         "standard-http-error": "^2.0.1",
         "typescript-collections": "^1.3.2",
         "url-loader": "^1.1.2",
         "uuid": "^3.3.2",
+        "words-to-numbers": "^1.5.1",
         "xoauth2": "^1.2.0",
         "youtube": "^0.1.0"
     }