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

This commit is contained in:
Claire
2026-03-24 12:13:39 +01:00
99 changed files with 2171 additions and 1313 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"packageManager": "yarn@4.12.0",
"packageManager": "yarn@4.13.0",
"engines": {
"node": ">=20"
},
@@ -51,8 +51,9 @@
"@optimize-lodash/rollup-plugin": "^6.0.0",
"@react-spring/web": "^9.7.5",
"@reduxjs/toolkit": "^2.0.1",
"@rolldown/plugin-babel": "^0.2.2",
"@use-gesture/react": "^10.3.1",
"@vitejs/plugin-legacy": "^7.2.1",
"@vitejs/plugin-legacy": "^8.0.0",
"@vitejs/plugin-react": "^5.0.0",
"arrow-key-navigation": "^1.2.0",
"async-mutex": "^0.5.0",
@@ -110,8 +111,8 @@
"redux-immutable": "^4.0.0",
"regenerator-runtime": "^0.14.0",
"requestidlecallback": "^0.3.0",
"rollup-plugin-gzip": "^4.1.1",
"rollup-plugin-visualizer": "^6.0.3",
"rollup-plugin-gzip": "^4.2.0",
"rollup-plugin-visualizer": "^7.0.1",
"sass": "^1.62.1",
"scroll-behavior": "^0.11.0",
"stacktrace-js": "^2.0.2",
@@ -121,11 +122,10 @@
"tiny-queue": "^0.2.1",
"twitter-text": "3.1.0",
"use-debounce": "^10.0.0",
"vite": "^7.1.1",
"vite": "^8.0.0",
"vite-plugin-manifest-sri": "^0.2.0",
"vite-plugin-pwa": "^1.0.2",
"vite-plugin-svgr": "^4.3.0",
"vite-tsconfig-paths": "^6.0.0",
"vite-plugin-pwa": "^1.2.0",
"vite-plugin-svgr": "^4.5.0",
"wicg-inert": "^3.1.2",
"workbox-expiration": "^7.3.0",
"workbox-routing": "^7.3.0",
@@ -135,10 +135,10 @@
"devDependencies": {
"@eslint/js": "^9.39.2",
"@formatjs/cli": "^6.1.1",
"@storybook/addon-a11y": "^10.0.6",
"@storybook/addon-docs": "^10.0.6",
"@storybook/addon-vitest": "^10.0.6",
"@storybook/react-vite": "^10.0.6",
"@storybook/addon-a11y": "^10.3.0",
"@storybook/addon-docs": "^10.3.0",
"@storybook/addon-vitest": "^10.3.0",
"@storybook/react-vite": "^10.3.0",
"@testing-library/dom": "^10.4.1",
"@testing-library/react": "^16.3.0",
"@types/debug": "^4",
@@ -163,10 +163,10 @@
"@types/react-toggle": "^4.0.3",
"@types/redux-immutable": "^4.0.3",
"@types/requestidlecallback": "^0.3.5",
"@vitest/browser": "^4.0.5",
"@vitest/browser-playwright": "^4.0.5",
"@vitest/coverage-v8": "^4.0.5",
"@vitest/ui": "^4.0.5",
"@vitest/browser": "^4.1.0",
"@vitest/browser-playwright": "^4.1.0",
"@vitest/coverage-v8": "^4.1.0",
"@vitest/ui": "^4.1.0",
"chromatic": "^13.3.3",
"eslint": "^9.39.2",
"eslint-import-resolver-typescript": "^4.2.5",
@@ -187,13 +187,13 @@
"oxfmt": "^0.33.0",
"playwright": "^1.57.0",
"react-test-renderer": "^18.2.0",
"storybook": "^10.0.5",
"storybook": "^10.3.0",
"stylelint": "^17.0.0",
"stylelint-config-standard-scss": "^17.0.0",
"typescript": "~5.9.0",
"typescript-eslint": "^8.55.0",
"typescript-plugin-css-modules": "^5.2.0",
"vitest": "^4.0.5"
"vitest": "^4.1.0"
},
"resolutions": {
"@types/react": "^18.2.7",