Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Essem 2024-05-06 22:12:42 -05:00
commit b636ca2099
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
353 changed files with 4050 additions and 2011 deletions

View file

@ -1,7 +1,7 @@
{
"name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"packageManager": "yarn@4.1.1",
"packageManager": "yarn@4.2.1",
"engines": {
"node": ">=18"
},
@ -67,7 +67,7 @@
"core-js": "^3.30.2",
"cross-env": "^7.0.3",
"css-loader": "^5.2.7",
"cssnano": "^6.0.1",
"cssnano": "^7.0.0",
"detect-passive-events": "^2.0.3",
"emoji-mart": "npm:emoji-mart-lazyload@latest",
"escape-html": "^1.0.3",
@ -171,6 +171,7 @@
"@types/redux-immutable": "^4.0.3",
"@types/requestidlecallback": "^0.3.5",
"@types/webpack": "^4.41.33",
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.0.0",
"babel-jest": "^29.5.0",