Merge branch 'glitch'`

1 files changed, 66 insertions, 64 deletions

diff --git a/package.json b/package.json
index 078ad82f7..c00dea8b3 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "mastodon",
+  "name": "@tootsuite/mastodon",
   "license": "AGPL-3.0-or-later",
   "engines": {
-    "node": ">=8.12 <12"
+    "node": ">=8.12 <13"
   },
   "scripts": {
     "postversion": "git push --tags",
@@ -60,59 +60,59 @@
   },
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/plugin-proposal-decorators": "^7.4.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-react-inline-elements": "^7.2.0",
-    "@babel/plugin-transform-react-jsx-self": "^7.2.0",
-    "@babel/plugin-transform-react-jsx-source": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/runtime": "^7.4.5",
-    "@clusterws/cws": "^0.14.0",
+    "@babel/core": "^7.7.4",
+    "@babel/plugin-proposal-class-properties": "^7.7.4",
+    "@babel/plugin-proposal-decorators": "^7.7.4",
+    "@babel/plugin-transform-react-inline-elements": "^7.7.4",
+    "@babel/plugin-transform-runtime": "^7.7.4",
+    "@babel/preset-env": "^7.7.4",
+    "@babel/preset-react": "^7.7.4",
+    "@babel/runtime": "^7.7.4",
+    "@gamestdio/websocket": "^0.3.2",
+    "@clusterws/cws": "^0.16.0",
     "array-includes": "^3.0.3",
     "atrament": "^0.2.3",
-    "autoprefixer": "^9.5.1",
+    "arrow-key-navigation": "^1.1.0",
+    "autoprefixer": "^9.7.3",
     "axios": "^0.19.0",
-    "babel-loader": "^8.0.5",
+    "babel-loader": "^8.0.6",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-preval": "^3.0.1",
-    "babel-plugin-react-intl": "^3.1.3",
+    "babel-plugin-preval": "^4.0.0",
+    "babel-plugin-react-intl": "^3.4.1",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-runtime": "^6.26.0",
-    "blurhash": "^1.0.0",
+    "blurhash": "^1.1.3",
     "classnames": "^2.2.5",
-    "compression-webpack-plugin": "^2.0.0",
-    "cross-env": "^5.1.4",
-    "css-loader": "^2.1.1",
+    "compression-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^5.0.5",
+    "cross-env": "^6.0.3",
+    "css-loader": "^3.2.0",
     "cssnano": "^4.1.10",
     "detect-passive-events": "^1.0.2",
-    "dotenv": "^8.0.0",
+    "dotenv": "^8.2.0",
     "emoji-mart": "Gargron/emoji-mart#build",
-    "es6-symbol": "^3.1.1",
+    "es6-symbol": "^3.1.2",
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",
     "express": "^4.17.1",
+    "file-loader": "^4.2.0",
     "favico.js": "^0.3.10",
-    "file-loader": "^3.0.1",
     "font-awesome": "^4.7.0",
-    "glob": "^7.1.1",
+    "glob": "^7.1.6",
+    "history": "^4.10.1",
     "http-link-header": "^1.0.2",
     "immutable": "^3.8.2",
     "imports-loader": "^0.8.0",
     "intersection-observer": "^0.7.0",
     "intl": "^1.2.5",
     "intl-messageformat": "^2.2.0",
-    "intl-relativeformat": "^2.2.0",
+    "intl-relativeformat": "^6.4.3",
     "is-nan": "^1.2.1",
     "js-yaml": "^3.13.1",
-    "lodash": "^4.7.11",
+    "lodash": "^4.17.14",
     "mark-loader": "^0.1.6",
     "marky": "^1.2.1",
-    "mini-css-extract-plugin": "^0.5.0",
+    "mini-css-extract-plugin": "^0.8.0",
     "mkdirp": "^0.5.1",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
@@ -125,65 +125,67 @@
     "postcss-object-fit-images": "^1.1.2",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
-    "rails-ujs": "^5.2.3",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
+    "rails-ujs": "^5.2.4",
+    "react": "^16.10.2",
+    "react-dom": "^16.12.0",
     "react-hotkeys": "^1.1.4",
     "react-immutable-proptypes": "^2.1.0",
     "react-immutable-pure-component": "^1.1.1",
     "react-intl": "^2.9.0",
     "react-masonry-infinite": "^1.2.2",
     "react-motion": "^0.5.2",
-    "react-notification": "^6.8.4",
-    "react-overlays": "^0.8.3",
-    "react-redux": "^6.0.1",
+    "react-notification": "^6.8.5",
+    "react-overlays": "^0.9.1",
+    "react-redux": "^7.1.1",
     "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
-    "react-select": "^2.4.4",
+    "react-select": "^3.0.8",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.13.3",
-    "react-textarea-autosize": "^7.1.0",
-    "react-toggle": "^4.0.1",
+    "react-textarea-autosize": "^7.1.2",
+    "react-toggle": "^4.1.1",
     "redis": "^2.7.1",
-    "redux": "^4.0.1",
+    "redux": "^4.0.4",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
-    "rellax": "^1.7.1",
+    "rellax": "^1.10.0",
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.0.0",
-    "rimraf": "^2.6.3",
-    "sass": "^1.20.3",
-    "sass-loader": "^7.0.3",
-    "stringz": "^1.0.0",
+    "rimraf": "^3.0.0",
+    "sass": "^1.23.3",
+    "sass-loader": "^8.0.0",
+    "stringz": "^2.0.0",
     "substring-trie": "^1.0.2",
-    "terser-webpack-plugin": "^1.3.0",
+    "terser-webpack-plugin": "^2.2.1",
+    "tesseract.js": "^2.0.0-alpha.16",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
-    "uuid": "^3.1.0",
-    "webpack": "^4.29.6",
+    "uuid": "^3.3.3",
+    "wavesurfer.js": "^3.2.0",
+    "webpack": "^4.41.2",
     "webpack-assets-manifest": "^3.1.1",
-    "webpack-bundle-analyzer": "^3.1.0",
-    "webpack-cli": "^3.3.2",
+    "webpack-bundle-analyzer": "^3.6.0",
+    "webpack-cli": "^3.3.10",
     "webpack-merge": "^4.2.1",
-    "websocket.js": "^0.1.12"
+    "wicg-inert": "^3.0.0"
   },
   "devDependencies": {
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.8.0",
-    "enzyme": "^3.8.0",
-    "enzyme-adapter-react-16": "^1.7.1",
-    "eslint": "^5.11.1",
-    "eslint-plugin-import": "~2.14.0",
-    "eslint-plugin-jsx-a11y": "~6.2.1",
-    "eslint-plugin-promise": "~4.1.1",
-    "eslint-plugin-react": "~7.12.1",
-    "jest": "^24.8.0",
+    "babel-eslint": "^10.0.3",
+    "babel-jest": "^24.9.0",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.15.1",
+    "eslint": "^6.7.2",
+    "eslint-plugin-import": "~2.18.2",
+    "eslint-plugin-jsx-a11y": "~6.2.3",
+    "eslint-plugin-promise": "~4.2.1",
+    "eslint-plugin-react": "~7.17.0",
+    "jest": "^24.9.0",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
-    "react-test-renderer": "^16.8.6",
+    "react-test-renderer": "^16.11.0",
     "sass-lint": "^1.13.1",
-    "webpack-dev-server": "^3.5.1",
-    "yargs": "^12.0.5"
+    "webpack-dev-server": "^3.9.0",
+    "yargs": "^13.3.0"
   }
 }