Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
This commit is contained in:
Claire
2025-05-25 15:11:58 +02:00
parent dafe4f6642 a13756148d
commit 706c8bf1a0
108 changed files with 1297 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
yarn.lock
View File

@@ -1029,7 +1029,7 @@ __metadata:
languageName: node
linkType: hard
"@babel/preset-env@npm:^7.11.0":
"@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.26.9":
version: 7.27.2
resolution: "@babel/preset-env@npm:7.27.2"
dependencies:
@@ -2460,7 +2460,7 @@ __metadata:
"@github/webauthn-json": "npm:^2.1.1"
"@optimize-lodash/rollup-plugin": "npm:^5.0.2"
"@rails/ujs": "npm:7.1.501"
"@react-spring/web": "npm:^10.0.0"
"@react-spring/web": "npm:^9.7.5"
"@reduxjs/toolkit": "npm:^2.0.1"
"@testing-library/dom": "npm:^10.2.0"
"@testing-library/react": "npm:^16.0.0"
@@ -2488,6 +2488,7 @@ __metadata:
"@types/redux-immutable": "npm:^4.0.3"
"@types/requestidlecallback": "npm:^0.3.5"
"@use-gesture/react": "npm:^10.3.1"
"@vitejs/plugin-legacy": "npm:^6.1.1"
"@vitejs/plugin-react": "npm:^4.2.1"
arrow-key-navigation: "npm:^1.2.0"
async-mutex: "npm:^0.5.0"
@@ -2889,69 +2890,69 @@ __metadata:
languageName: node
linkType: hard
"@react-spring/animated@npm:~10.0.1":
version: 10.0.1
resolution: "@react-spring/animated@npm:10.0.1"
"@react-spring/animated@npm:~9.7.5":
version: 9.7.5
resolution: "@react-spring/animated@npm:9.7.5"
dependencies:
"@react-spring/shared": "npm:~10.0.1"
"@react-spring/types": "npm:~10.0.1"
"@react-spring/shared": "npm:~9.7.5"
"@react-spring/types": "npm:~9.7.5"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
checksum: 10c0/aaccd4a8b0280ac846d463b253ad8f092ee4afc9dbedc8e77616adf5399ffec755344f09fdd8487cadaf815840dff84d354d1143579c27c2fcd6937549b5fc40
react: ^16.8.0 || ^17.0.0 || ^18.0.0
checksum: 10c0/f8c2473c60f39a878c7dd0fdfcfcdbc720521e1506aa3f63c9de64780694a0a73d5ccc535a5ccec3520ddb70a71cf43b038b32c18e99531522da5388c510ecd7
languageName: node
linkType: hard
"@react-spring/core@npm:~10.0.1":
version: 10.0.1
resolution: "@react-spring/core@npm:10.0.1"
"@react-spring/core@npm:~9.7.5":
version: 9.7.5
resolution: "@react-spring/core@npm:9.7.5"
dependencies:
"@react-spring/animated": "npm:~10.0.1"
"@react-spring/shared": "npm:~10.0.1"
"@react-spring/types": "npm:~10.0.1"
"@react-spring/animated": "npm:~9.7.5"
"@react-spring/shared": "npm:~9.7.5"
"@react-spring/types": "npm:~9.7.5"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
checksum: 10c0/059b122dda4138e5e7e461abd49350921e326735ca9a1d8aa19b1fdbae0937661b5f71af6fe82fd8f59e8db5549627849b38cc3f7ef2ec7ee9c93c3d6225174f
react: ^16.8.0 || ^17.0.0 || ^18.0.0
checksum: 10c0/5bfd83dfe248cd91889f215f015d908c7714ef445740fd5afa054b27ebc7d5a456abf6c309e2459d9b5b436e78d6fda16b62b9601f96352e9130552c02270830
languageName: node
linkType: hard
"@react-spring/rafz@npm:~10.0.1":
version: 10.0.1
resolution: "@react-spring/rafz@npm:10.0.1"
checksum: 10c0/cba76f143d3a06f79dd0c09f7aefd17df9cca9b2c1ef7f9103255e5351326f4a42a5a1366f731a78f74380d96ba683bcc2a49312ed1e4b9e9e249e72c9ff68cb
"@react-spring/rafz@npm:~9.7.5":
version: 9.7.5
resolution: "@react-spring/rafz@npm:9.7.5"
checksum: 10c0/8bdad180feaa9a0e870a513043a5e98a4e9b7292a9f887575b7e6fadab2677825bc894b7ff16c38511b35bfe6cc1072df5851c5fee64448d67551559578ca759
languageName: node
linkType: hard
"@react-spring/shared@npm:~10.0.1":
version: 10.0.1
resolution: "@react-spring/shared@npm:10.0.1"
"@react-spring/shared@npm:~9.7.5":
version: 9.7.5
resolution: "@react-spring/shared@npm:9.7.5"
dependencies:
"@react-spring/rafz": "npm:~10.0.1"
"@react-spring/types": "npm:~10.0.1"
"@react-spring/rafz": "npm:~9.7.5"
"@react-spring/types": "npm:~9.7.5"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
checksum: 10c0/f056aaa018b3744afd8244e8eea24534d32f92fad9ace815b80e159b296fb5db148e2c9bd840ad9a5188e7a3c0778fd564b8af9ae02cd500e019a228398fb3cf
react: ^16.8.0 || ^17.0.0 || ^18.0.0
checksum: 10c0/0207eacccdedd918a2fc55e78356ce937f445ce27ad9abd5d3accba8f9701a39349b55115641dc2b39bb9d3a155b058c185b411d292dc8cc5686bfa56f73b94f
languageName: node
linkType: hard
"@react-spring/types@npm:~10.0.1":
version: 10.0.1
resolution: "@react-spring/types@npm:10.0.1"
checksum: 10c0/260890f9c156dc69b77c846510017156d8c0a07cce70edc7c108e57b0cf4122b26a15e724b191481a51b2c914296de9e81d56618b2c339339d4b221930691baa
"@react-spring/types@npm:~9.7.5":
version: 9.7.5
resolution: "@react-spring/types@npm:9.7.5"
checksum: 10c0/85c05121853cacb64f7cf63a4855e9044635e1231f70371cd7b8c78bc10be6f4dd7c68f592f92a2607e8bb68051540989b4677a2ccb525dba937f5cd95dc8bc1
languageName: node
linkType: hard
"@react-spring/web@npm:^10.0.0":
version: 10.0.1
resolution: "@react-spring/web@npm:10.0.1"
"@react-spring/web@npm:^9.7.5":
version: 9.7.5
resolution: "@react-spring/web@npm:9.7.5"
dependencies:
"@react-spring/animated": "npm:~10.0.1"
"@react-spring/core": "npm:~10.0.1"
"@react-spring/shared": "npm:~10.0.1"
"@react-spring/types": "npm:~10.0.1"
"@react-spring/animated": "npm:~9.7.5"
"@react-spring/core": "npm:~9.7.5"
"@react-spring/shared": "npm:~9.7.5"
"@react-spring/types": "npm:~9.7.5"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
checksum: 10c0/a0c788c9fd881ccb834feb22fc0694e74e59f7b76e498f0096f5b65e2c9812513955bf45ee27d7c5348f56a7bba7c5a6961d4be663728bb2172fe5aa6b6bdfc4
react: ^16.8.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
checksum: 10c0/bcd1e052e1b16341a12a19bf4515f153ca09d1fa86ff7752a5d02d7c4db58e8baf80e6283e64411f1e388c65340dce2254b013083426806b5dbae38bd151e53e
languageName: node
linkType: hard
@@ -2988,6 +2989,13 @@ __metadata:
languageName: node
linkType: hard
"@rolldown/pluginutils@npm:1.0.0-beta.9":
version: 1.0.0-beta.9
resolution: "@rolldown/pluginutils@npm:1.0.0-beta.9"
checksum: 10c0/21aebb7ebd093282efd96f63ddd465f76746b1d70282366d6ccc7fff6eb4da5c2f8f4bfaaaeb4283c2432600e5609e39e9897864575e593efc11d376ca1a6fa1
languageName: node
linkType: hard
"@rollup/plugin-babel@npm:^5.2.0":
version: 5.3.1
resolution: "@rollup/plugin-babel@npm:5.3.1"
@@ -4162,18 +4170,38 @@ __metadata:
languageName: node
linkType: hard
"@vitejs/plugin-legacy@npm:^6.1.1":
version: 6.1.1
resolution: "@vitejs/plugin-legacy@npm:6.1.1"
dependencies:
"@babel/core": "npm:^7.26.10"
"@babel/preset-env": "npm:^7.26.9"
browserslist: "npm:^4.24.4"
browserslist-to-esbuild: "npm:^2.1.1"
core-js: "npm:^3.41.0"
magic-string: "npm:^0.30.17"
regenerator-runtime: "npm:^0.14.1"
systemjs: "npm:^6.15.1"
peerDependencies:
terser: ^5.16.0
vite: ^6.0.0
checksum: 10c0/3a41098e422246d7ddbb6add678c1317474679a5e82e011947898cea5336fa8da9bb8fa625ab1284265f6ba123278fc2bf7c5b0b9b87febaaf865f14ac8e6ece
languageName: node
linkType: hard
"@vitejs/plugin-react@npm:^4.2.1":
version: 4.4.1
resolution: "@vitejs/plugin-react@npm:4.4.1"
version: 4.5.0
resolution: "@vitejs/plugin-react@npm:4.5.0"
dependencies:
"@babel/core": "npm:^7.26.10"
"@babel/plugin-transform-react-jsx-self": "npm:^7.25.9"
"@babel/plugin-transform-react-jsx-source": "npm:^7.25.9"
"@rolldown/pluginutils": "npm:1.0.0-beta.9"
"@types/babel__core": "npm:^7.20.5"
react-refresh: "npm:^0.17.0"
peerDependencies:
vite: ^4.2.0 || ^5.0.0 || ^6.0.0
checksum: 10c0/0eda45f2026cdfff4b172b1b2148824e5ac41ce65f1f1ce108f3ce4de2f0024caf79c811c1305a782168a269b0b1bc58d4cf8eaf164e4ef19954f05428ba7077
checksum: 10c0/c9f75cde098b9aac62cb512103d7f898a0a173cb78dc9fcf79ca4b3f21a1458cd1955a4383c8c9e3841ce23c5e7f02ed1455e445c9574879b143d40734121fd8
languageName: node
linkType: hard
@@ -4815,6 +4843,19 @@ __metadata:
languageName: node
linkType: hard
"browserslist-to-esbuild@npm:^2.1.1":
version: 2.1.1
resolution: "browserslist-to-esbuild@npm:2.1.1"
dependencies:
meow: "npm:^13.0.0"
peerDependencies:
browserslist: "*"
bin:
browserslist-to-esbuild: cli/index.js
checksum: 10c0/4d1968efd72850949d5dfa355f4663c695a8fd7b259b19cc81ecd0ed33dd37bbd327475c644de3f2beb53e737c6e511c6e84ed3e97a2ff49f117505a7707c72d
languageName: node
linkType: hard
"browserslist@npm:^4.24.0, browserslist@npm:^4.24.4":
version: 4.24.4
resolution: "browserslist@npm:4.24.4"
@@ -5212,7 +5253,7 @@ __metadata:
languageName: node
linkType: hard
"core-js@npm:^3.30.2":
"core-js@npm:^3.30.2, core-js@npm:^3.41.0":
version: 3.42.0
resolution: "core-js@npm:3.42.0"
checksum: 10c0/2913d3d5452d54ad92f058d66046782d608c05e037bcc523aab79c04454fe640998f94e6011292969d66dfa472f398b085ce843dcb362056532a5799c627184e
@@ -8344,7 +8385,7 @@ __metadata:
languageName: node
linkType: hard
"meow@npm:^13.2.0":
"meow@npm:^13.0.0, meow@npm:^13.2.0":
version: 13.2.0
resolution: "meow@npm:13.2.0"
checksum: 10c0/d5b339ae314715bcd0b619dd2f8a266891928e21526b4800d49b4fba1cc3fff7e2c1ff5edd3344149fac841bc2306157f858e8c4d5eaee4d52ce52ad925664ce
@@ -10422,7 +10463,7 @@ __metadata:
languageName: node
linkType: hard
"regenerator-runtime@npm:^0.14.0":
"regenerator-runtime@npm:^0.14.0, regenerator-runtime@npm:^0.14.1":
version: 0.14.1
resolution: "regenerator-runtime@npm:0.14.1"
checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
@@ -11706,6 +11747,13 @@ __metadata:
languageName: node
linkType: hard
"systemjs@npm:^6.15.1":
version: 6.15.1
resolution: "systemjs@npm:6.15.1"
checksum: 10c0/106e5751a49dbe4acb17fa1474a43b27fd26efbee1b322c00c04c08f3e95de756adfba828d743af89bef7fa10888da8a5c5ceb55dae5c42e4909b151168ad192
languageName: node
linkType: hard
"table@npm:^6.9.0":
version: 6.9.0
resolution: "table@npm:6.9.0"