Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream

Conflicts:
- `jest.config.js`
- `package.json`
- `tsconfig.json`

eslint.config.mjs

@@ -266,6 +266,7 @@ export default tseslint.config([
             'config/webpack/**',
             'app/javascript/mastodon/performance.js',
             'app/javascript/mastodon/test_setup.js',
+            'app/javascript/mastodon/test_helpers.tsx',
             'app/javascript/**/__tests__/**',
           ],
         },
@@ -411,9 +412,7 @@ export default tseslint.config([
     files: ['**/__tests__/*.js', '**/__tests__/*.jsx'],
 
     languageOptions: {
-      globals: {
-        ...globals.jest,
-      },
+      globals: globals.vitest,
     },
   },
 ]);