merge

1 files changed, 15 insertions, 6 deletions

diff --git a/package.json b/package.json
index 96fac2d6a..90141c321 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,6 @@
         "tsc": "tsc"
     },
     "devDependencies": {
-        "@types/chai": "^4.2.7",
-        "@types/mocha": "^5.2.6",
-        "@types/react-dom": "^16.9.5",
-        "@types/webpack-dev-middleware": "^2.0.2",
-        "@types/webpack-hot-middleware": "^2.25.0",
         "@types/adm-zip": "^0.4.32",
         "@types/animejs": "^2.0.2",
         "@types/archiver": "^3.0.0",
@@ -30,6 +25,7 @@
         "@types/bcrypt-nodejs": "0.0.30",
         "@types/bluebird": "^3.5.29",
         "@types/body-parser": "^1.17.1",
+        "@types/chai": "^4.2.7",
         "@types/color": "^3.0.1",
         "@types/connect-flash": "0.0.34",
         "@types/cookie-parser": "^1.4.2",
@@ -46,6 +42,7 @@
         "@types/libxmljs": "^0.18.5",
         "@types/lodash": "^4.14.149",
         "@types/mobile-detect": "^1.3.4",
+        "@types/mocha": "^5.2.6",
         "@types/mongodb": "^3.3.14",
         "@types/mongoose": "^5.5.43",
         "@types/node": "^10.17.13",
@@ -68,6 +65,8 @@
         "@types/react": "^16.9.19",
         "@types/react-autosuggest": "^9.3.13",
         "@types/react-color": "^2.17.3",
+        "@types/react-dom": "^16.9.5",
+        "@types/react-grid-layout": "^0.17.1",
         "@types/react-measure": "^2.0.6",
         "@types/react-table": "^6.8.6",
         "@types/request": "^2.48.4",
@@ -81,6 +80,8 @@
         "@types/uuid": "^3.4.6",
         "@types/valid-url": "^1.0.3",
         "@types/webpack": "^4.41.3",
+        "@types/webpack-dev-middleware": "^2.0.2",
+        "@types/webpack-hot-middleware": "^2.25.0",
         "@types/xregexp": "^4.3.0",
         "@types/youtube": "0.0.39",
         "awesome-typescript-loader": "^5.2.1",
@@ -116,13 +117,15 @@
         "@hig/flyout": "^1.2.0",
         "@hig/theme-context": "^2.1.3",
         "@hig/theme-data": "^2.13.0",
-        "@types/chrome": "0.0.114",
+        "@types/webscopeio__react-textarea-autocomplete": "^4.6.1",
+        "@webscopeio/react-textarea-autocomplete": "^4.6.3",
         "adm-zip": "^0.4.13",
         "archiver": "^3.1.1",
         "array-batcher": "^1.2.3",
         "async": "^2.6.2",
         "babel-runtime": "^6.26.0",
         "bcrypt-nodejs": "0.0.3",
+        "bezier-curve": "^1.0.0",
         "bluebird": "^3.7.2",
         "body-parser": "^1.18.3",
         "bootstrap": "^4.4.1",
@@ -145,6 +148,7 @@
         "express-validator": "^5.3.1",
         "expressjs": "^1.0.1",
         "find-in-files": "^0.5.0",
+        "fit-curve": "^0.1.7",
         "flexlayout-react": "^0.3.3",
         "formidable": "^1.2.1",
         "golden-layout": "^1.5.9",
@@ -184,6 +188,7 @@
         "pdfjs-dist": "^2.3.200",
         "probe-image-size": "^4.0.0",
         "prosemirror-commands": "^1.1.3",
+        "prosemirror-dev-tools": "^3.0.0",
         "prosemirror-find-replace": "^0.9.0",
         "prosemirror-history": "^1.1.3",
         "prosemirror-inputrules": "^1.1.2",
@@ -202,9 +207,11 @@
         "react-color": "^2.18.0",
         "react-compound-slider": "^2.5.0",
         "react-dom": "^16.12.0",
+        "react-grid-layout": "^0.18.3",
         "react-image-lightbox-with-rotate": "^5.1.1",
         "react-jsx-parser": "^1.21.0",
         "react-measure": "^2.2.4",
+        "react-resizable": "^1.10.1",
         "react-table": "^6.11.5",
         "readline": "^1.3.0",
         "request": "^2.88.0",
@@ -217,7 +224,9 @@
         "socket.io-client": "^2.3.0",
         "solr-node": "^1.2.1",
         "standard-http-error": "^2.0.1",
+        "textarea-caret": "^3.1.0",
         "typescript-collections": "^1.3.3",
+        "typescript-language-server": "^0.4.0",
         "url-loader": "^1.1.2",
         "uuid": "^3.4.0",
         "valid-url": "^1.0.9",