Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.

1 files changed, 14 insertions, 14 deletions

diff --git a/package.json b/package.json
index b125f8cb6..810b6b3b3 100644
--- a/package.json
+++ b/package.json
@@ -66,8 +66,8 @@
     "@babel/plugin-transform-react-inline-elements": "^7.12.1",
     "@babel/plugin-transform-runtime": "^7.12.1",
     "@babel/preset-env": "^7.12.1",
-    "@babel/preset-react": "^7.12.1",
-    "@babel/runtime": "^7.12.1",
+    "@babel/preset-react": "^7.12.5",
+    "@babel/runtime": "^7.12.5",
     "@clusterws/cws": "^3.0.0",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^0.5.7",
@@ -85,9 +85,9 @@
     "babel-runtime": "^6.26.0",
     "blurhash": "^1.1.3",
     "classnames": "^2.2.5",
-    "compression-webpack-plugin": "^6.0.4",
+    "compression-webpack-plugin": "^6.1.0",
     "cross-env": "^7.0.2",
-    "css-loader": "^5.0.0",
+    "css-loader": "^5.0.1",
     "cssnano": "^4.1.10",
     "detect-passive-events": "^2.0.1",
     "dotenv": "^8.2.0",
@@ -113,7 +113,7 @@
     "lodash": "^4.17.19",
     "mark-loader": "^0.1.6",
     "marky": "^1.2.1",
-    "mini-css-extract-plugin": "^1.2.1",
+    "mini-css-extract-plugin": "^1.3.0",
     "mkdirp": "^1.0.4",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
@@ -144,7 +144,7 @@
     "react-select": "^3.1.0",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.13.9",
-    "react-textarea-autosize": "^8.2.0",
+    "react-textarea-autosize": "^8.3.0",
     "react-toggle": "^4.1.1",
     "redis": "^3.0.2",
     "redux": "^4.0.5",
@@ -155,8 +155,8 @@
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.0.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.28.0",
-    "sass-loader": "^10.0.4",
+    "sass": "^1.29.0",
+    "sass-loader": "^10.0.5",
     "stacktrace-js": "^2.0.2",
     "stringz": "^2.1.0",
     "substring-trie": "^1.0.2",
@@ -167,22 +167,22 @@
     "uuid": "^8.3.1",
     "webpack": "^4.44.2",
     "webpack-assets-manifest": "^3.1.1",
-    "webpack-bundle-analyzer": "^3.9.0",
+    "webpack-bundle-analyzer": "^4.1.0",
     "webpack-cli": "^3.3.12",
-    "webpack-merge": "^5.0.9",
+    "webpack-merge": "^5.3.0",
     "wicg-inert": "^3.1.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.11.5",
-    "@testing-library/react": "^11.1.0",
+    "@testing-library/react": "^11.1.1",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.6.1",
-    "eslint": "^7.12.1",
+    "babel-jest": "^26.6.3",
+    "eslint": "^7.13.0",
     "eslint-plugin-import": "~2.22.1",
     "eslint-plugin-jsx-a11y": "~6.4.1",
     "eslint-plugin-promise": "~4.2.1",
     "eslint-plugin-react": "~7.21.5",
-    "jest": "^26.6.1",
+    "jest": "^26.6.3",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
     "react-test-renderer": "^16.14.0",