diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 0cf15040cd..7b1b25a19b 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -28,6 +28,9 @@ // react-router: Requires manual upgrade 'history', 'react-router-dom', + + // react-spring: Requires manual upgrade when upgrading react + '@react-spring/web', ], matchUpdateTypes: ['major'], dependencyDashboardApproval: true, diff --git a/app/javascript/mastodon/features/video/components/hotkey_indicator.tsx b/app/javascript/mastodon/features/video/components/hotkey_indicator.tsx index 6251729273..1abbb96fc0 100644 --- a/app/javascript/mastodon/features/video/components/hotkey_indicator.tsx +++ b/app/javascript/mastodon/features/video/components/hotkey_indicator.tsx @@ -24,9 +24,7 @@ export const HotkeyIndicator: React.FC<{ enter: [{ opacity: 1 }], leave: [{ opacity: 0 }], onRest: (_result, _ctrl, item) => { - if (item) { - onDismiss(item); - } + onDismiss(item); }, }); diff --git a/package.json b/package.json index 3740a6b87b..db02f029a8 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@github/webauthn-json": "^2.1.1", "@optimize-lodash/rollup-plugin": "^5.0.2", "@rails/ujs": "7.1.501", - "@react-spring/web": "^10.0.0", + "@react-spring/web": "^9.7.5", "@reduxjs/toolkit": "^2.0.1", "@use-gesture/react": "^10.3.1", "@vitejs/plugin-legacy": "^6.1.1", diff --git a/yarn.lock b/yarn.lock index 632694c419..d14b54b0d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -2887,69 +2887,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