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

Conflicts:
- `package.json`:
  Upstream updated `jest`, moving its config in a separate file.
  This config was modified in glitch-soc, so the corresponding changes have
  been ported to `jest.config.js`

package.json

@@ -28,39 +28,6 @@
     "iOS >= 9",
     "not dead"
   ],
-  "jest": {
-    "testEnvironment": "jsdom",
-    "projects": [
-      "<rootDir>/app/javascript/mastodon"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/node_modules/",
-      "<rootDir>/vendor/",
-      "<rootDir>/config/",
-      "<rootDir>/log/",
-      "<rootDir>/public/",
-      "<rootDir>/tmp/",
-      "<rootDir>/app/javascript/themes/"
-    ],
-    "setupFiles": [
-      "raf/polyfill"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/app/javascript/mastodon/test_setup.js"
-    ],
-    "collectCoverageFrom": [
-      "app/javascript/mastodon/**/*.js",
-      "!app/javascript/mastodon/features/emoji/emoji_compressed.js",
-      "!app/javascript/mastodon/locales/locale-data/*.js",
-      "!app/javascript/mastodon/service_worker/entry.js",
-      "!app/javascript/mastodon/test_setup.js"
-    ],
-    "coverageDirectory": "<rootDir>/coverage",
-    "moduleDirectories": [
-      "<rootDir>/node_modules",
-      "<rootDir>/app/javascript"
-    ]
-  },
   "private": true,
   "dependencies": {
     "@babel/core": "^7.17.10",
@@ -148,7 +115,7 @@
     "react-swipeable-views": "^0.14.0",
     "react-textarea-autosize": "^8.3.3",
     "react-toggle": "^4.1.2",
-    "redis": "^4.0.6",
+    "redis": "^4.1.0",
     "redux": "^4.1.2",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.4.1",
@@ -174,19 +141,20 @@
     "webpack-cli": "^3.3.12",
     "webpack-merge": "^5.8.0",
     "wicg-inert": "^3.1.1",
-    "ws": "^8.5.0"
+    "ws": "^8.6.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.1.5",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.5.1",
+    "babel-jest": "^28.0.3",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "~2.26.0",
     "eslint-plugin-jsx-a11y": "~6.5.1",
     "eslint-plugin-promise": "~6.0.0",
     "eslint-plugin-react": "~7.29.4",
-    "jest": "^27.5.1",
+    "jest": "^28.0.3",
+    "jest-environment-jsdom": "^28.0.2",
     "prettier": "^2.6.2",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",