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

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change.

1 files changed, 14 insertions, 15 deletions

diff --git a/package.json b/package.json
index 3542f45ff..726e5d2c0 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "start": "node ./streaming/index.js",
     "test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest",
     "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
-    "test:lint:js": "eslint --ext=js . --cache",
+    "test:lint:js": "eslint --ext=js . --cache --report-unused-disable-directives",
     "test:lint:sass": "stylelint \"**/*.{css,scss}\"",
     "test:jest": "cross-env NODE_ENV=test jest",
     "format": "prettier --write \"**/*.{json,yml}\"",
@@ -39,7 +39,7 @@
     "atrament": "0.2.4",
     "arrow-key-navigation": "^1.2.0",
     "autoprefixer": "^9.8.8",
-    "axios": "^1.2.3",
+    "axios": "^1.2.6",
     "babel-loader": "^8.3.0",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-preval": "^5.1.0",
@@ -69,7 +69,6 @@
     "http-link-header": "^1.1.0",
     "immutable": "^4.2.2",
     "imports-loader": "^1.2.0",
-    "intersection-observer": "^0.12.2",
     "intl": "^1.2.5",
     "intl-messageformat": "^2.2.0",
     "intl-relativeformat": "^6.4.3",
@@ -80,7 +79,7 @@
     "mark-loader": "^0.1.6",
     "marky": "^1.2.5",
     "mini-css-extract-plugin": "^1.6.2",
-    "mkdirp": "^1.0.4",
+    "mkdirp": "^2.1.3",
     "npmlog": "^7.0.1",
     "object-assign": "^4.1.1",
     "object.values": "^1.1.6",
@@ -90,7 +89,7 @@
     "postcss-loader": "^3.0.0",
     "promise.prototype.finally": "^3.1.4",
     "prop-types": "^15.8.1",
-    "punycode": "^2.2.0",
+    "punycode": "^2.3.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-helmet": "^6.1.0",
@@ -111,13 +110,13 @@
     "react-textarea-autosize": "^8.4.0",
     "react-toggle": "^4.1.3",
     "redis": "^4.0.6 <4.1.0",
-    "redux": "^4.2.0",
+    "redux": "^4.2.1",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.4.2",
     "regenerator-runtime": "^0.13.11",
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.1.7",
-    "rimraf": "^4.1.1",
+    "rimraf": "^4.1.2",
     "sass": "^1.57.1",
     "sass-loader": "^10.2.0",
     "stacktrace-js": "^2.0.2",
@@ -147,14 +146,14 @@
     "@babel/eslint-parser": "^7.19.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.5",
-    "babel-jest": "^29.3.1",
-    "eslint": "^7.32.0",
-    "eslint-plugin-import": "~2.26.0",
-    "eslint-plugin-jsx-a11y": "~6.6.1",
+    "babel-jest": "^29.4.1",
+    "eslint": "^8.33.0",
+    "eslint-plugin-import": "~2.27.5",
+    "eslint-plugin-jsx-a11y": "~6.7.1",
     "eslint-plugin-promise": "~6.1.1",
-    "eslint-plugin-react": "~7.32.1",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "^29.3.1",
+    "eslint-plugin-react": "~7.32.2",
+    "jest": "^29.4.1",
+    "jest-environment-jsdom": "^29.4.1",
     "postcss-scss": "^4.0.6",
     "prettier": "^2.8.3",
     "raf": "^3.4.1",
@@ -170,6 +169,6 @@
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.7",
-    "utf-8-validate": "^6.0.1"
+    "utf-8-validate": "^6.0.2"
   }
 }