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

Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.

1 files changed, 7 insertions, 7 deletions

diff --git a/package.json b/package.json
index e5a004d81..1cfd192d1 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "array-includes": "^3.1.3",
     "atrament": "0.2.4",
     "arrow-key-navigation": "^1.2.0",
-    "autoprefixer": "^9.8.6",
+    "autoprefixer": "^9.8.7",
     "axios": "^0.21.4",
     "babel-loader": "^8.2.2",
     "babel-plugin-lodash": "^3.3.4",
@@ -99,7 +99,7 @@
     "favico.js": "^0.3.10",
     "file-loader": "^6.2.0",
     "font-awesome": "^4.7.0",
-    "glob": "^7.1.7",
+    "glob": "^7.2.0",
     "history": "^4.10.1",
     "http-link-header": "^1.0.3",
     "immutable": "^3.8.2",
@@ -176,27 +176,27 @@
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.1.0",
+    "@testing-library/react": "^12.1.1",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.2.0",
+    "babel-jest": "^27.2.2",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "~2.24.2",
     "eslint-plugin-jsx-a11y": "~6.4.1",
     "eslint-plugin-promise": "~5.1.0",
-    "eslint-plugin-react": "~7.25.1",
+    "eslint-plugin-react": "~7.26.0",
     "jest": "^27.2.0",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
     "react-test-renderer": "^16.14.0",
     "sass-lint": "^1.13.1",
     "webpack-dev-server": "^3.11.2",
-    "yargs": "^17.1.1"
+    "yargs": "^17.2.1"
   },
   "resolutions": {
     "kind-of": "^6.0.3"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.3",
-    "utf-8-validate": "^5.0.5"
+    "utf-8-validate": "^5.0.6"
   }
 }