Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.

package.json

@@ -151,9 +151,9 @@
     "@types/express": "^4.17.17",
     "@types/http-link-header": "^1.0.3",
     "@types/intl": "^1.2.0",
-    "@types/jest": "^29.4.2",
+    "@types/jest": "^29.5.1",
     "@types/js-yaml": "^4.0.5",
-    "@types/lodash": "^4.14.191",
+    "@types/lodash": "^4.14.194",
     "@types/npmlog": "^4.1.4",
     "@types/object-assign": "^4.0.30",
     "@types/pg": "^8.6.6",
@@ -179,13 +179,14 @@
     "@types/requestidlecallback": "^0.3.5",
     "@types/uuid": "^8.3.4",
     "@types/webpack": "^4.41.33",
-    "@types/yargs": "^17.0.22",
+    "@types/yargs": "^17.0.24",
     "@typescript-eslint/eslint-plugin": "^5.59.1",
     "@typescript-eslint/parser": "^5.59.1",
     "babel-jest": "^29.5.0",
-    "eslint": "^8.38.0",
+    "eslint": "^8.39.0",
     "eslint-plugin-formatjs": "^4.9.0",
     "eslint-plugin-import": "~2.27.5",
+    "eslint-plugin-jsdoc": "^43.1.1",
     "eslint-plugin-jsx-a11y": "~6.7.1",
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-react": "~7.32.2",
@@ -198,8 +199,8 @@
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
     "react-test-renderer": "^16.14.0",
-    "stylelint": "^15.3.0",
-    "stylelint-config-standard-scss": "^7.0.1",
+    "stylelint": "^15.6.0",
+    "stylelint-config-standard-scss": "^9.0.0",
     "typescript": "^5.0.4",
     "webpack-dev-server": "^3.11.3",
     "yargs": "^17.7.1"
@@ -214,6 +215,7 @@
   },
   "lint-staged": {
     "*": "prettier --ignore-unknown --write",
+    "Capfile|Gemfile|*.{rb,ruby,ru,rake}": "bundle exec rubocop -a",
     "*.{js,jsx,ts,tsx}": "eslint --fix",
     "*.{css,scss}": "stylelint --fix"
   }