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

Conflicts:
- `tsconfig.json`:
  Upstream added config for storybook files, while glitch-soc had an addition
  for the glitch flavor on the last line.
  Added upstream's new config.
- `yarn.lock`:
  Upstream added a new dependency to an `eslint` plugin textually adjacent to
  a couple glitch-only-dependencies.
  Added upstream's new dependency.

eslint.config.mjs

@@ -12,6 +12,7 @@ import jsxA11Y from 'eslint-plugin-jsx-a11y';
 import promisePlugin from 'eslint-plugin-promise';
 import react from 'eslint-plugin-react';
 import reactHooks from 'eslint-plugin-react-hooks';
+import storybook from 'eslint-plugin-storybook';
 import globals from 'globals';
 import tseslint from 'typescript-eslint';
 
@@ -206,6 +207,7 @@ export default tseslint.config([
   importPlugin.flatConfigs.react,
   // @ts-expect-error -- For some reason the formatjs package exports an empty object?
   formatjs.configs.strict,
+  storybook.configs['flat/recommended'],
   {
     languageOptions: {
       globals: {
@@ -271,6 +273,11 @@ export default tseslint.config([
             'app/javascript/mastodon/test_setup.js',
             'app/javascript/mastodon/test_helpers.tsx',
             'app/javascript/**/__tests__/**',
+            'app/javascript/**/*.stories.ts',
+            'app/javascript/**/*.stories.tsx',
+            'app/javascript/**/*.test.ts',
+            'app/javascript/**/*.test.tsx',
+            '.storybook/**/*.ts',
           ],
         },
       ],
@@ -422,4 +429,18 @@ export default tseslint.config([
       globals: globals.vitest,
     },
   },
+  {
+    files: ['**/*.stories.ts', '**/*.stories.tsx', '.storybook/**/*.ts'],
+    rules: {
+      'import/no-default-export': 'off',
+    },
+  },
+  {
+    files: ['vitest.shims.d.ts'],
+    rules: {
+      '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'off',
+      '@typescript-eslint/no-unnecessary-condition': 'off',
+      '@typescript-eslint/prefer-nullish-coalescing': 'off',
+    },
+  },
 ]);