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

Conflicts:
- `.prettierignore`:
  Upstream removed it, replaced by `.oxfmtrc.json`.
  We had glitch-specific files in there.
  Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`.
- `config/formatjs-formatter.js`:
  Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different.
  Glitch-soc had extra code in there.
  Reformatted appropriately.
- `eslint.config.mjs`:
  Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where
  glitch-soc had slightly different configuration.
  Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly.
- `package.json`:
  Upstream changed script definitions textually adjacent to one that we have modified.
  Applied upstream's change, keeping the textually adjacent modified script intact.

app/javascript/entrypoints/public.tsx

@@ -366,9 +366,9 @@ on('change', '#account_statuses_cleanup_policy_enabled', ({ target }) => {
   if (!(target instanceof HTMLInputElement) || !target.form) return;
 
   target.form
-    .querySelectorAll<
-      HTMLInputElement | HTMLSelectElement
-    >('input:not([type=hidden], #account_statuses_cleanup_policy_enabled), select')
+    .querySelectorAll<HTMLInputElement | HTMLSelectElement>(
+      'input:not([type=hidden], #account_statuses_cleanup_policy_enabled), select',
+    )
     .forEach((input) => {
       setInputDisabled(input, !target.checked);
     });

app/javascript/flavours/glitch/components/alt_text_badge.tsx

@@ -2,11 +2,11 @@ import { useState, useCallback, useRef, useId } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
 } from 'react-overlays/esm/usePopper';
+import Overlay from 'react-overlays/Overlay';
 
 import { useSelectableClick } from 'flavours/glitch/hooks/useSelectableClick';
 

app/javascript/flavours/glitch/components/dropdown_menu.tsx

@@ -13,12 +13,12 @@ import { Link } from 'react-router-dom';
 
 import type { Map as ImmutableMap } from 'immutable';
 
-import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
   Placement,
 } from 'react-overlays/esm/usePopper';
+import Overlay from 'react-overlays/Overlay';
 
 import { fetchRelationships } from 'flavours/glitch/actions/accounts';
 import {
@@ -90,7 +90,7 @@ export const DropdownMenuItemContent: React.FC<{ item: MenuItem }> = ({
   );
 };
 
-export const DropdownMenu = <Item = MenuItem,>({
+export const DropdownMenu = <Item = MenuItem>({
   items,
   loading,
   scrollable,

app/javascript/flavours/glitch/components/hover_card_controller.tsx

@@ -2,11 +2,11 @@ import { useEffect, useRef, useState, useCallback } from 'react';
 
 import { useLocation } from 'react-router-dom';
 
-import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
 } from 'react-overlays/esm/usePopper';
+import Overlay from 'react-overlays/Overlay';
 
 import { HoverCardAccount } from 'flavours/glitch/components/hover_card_account';
 import { useTimeout } from 'flavours/glitch/hooks/useTimeout';

app/javascript/flavours/glitch/entrypoints/public.tsx

@@ -366,9 +366,9 @@ on('change', '#account_statuses_cleanup_policy_enabled', ({ target }) => {
   if (!(target instanceof HTMLInputElement) || !target.form) return;
 
   target.form
-    .querySelectorAll<
-      HTMLInputElement | HTMLSelectElement
-    >('input:not([type=hidden], #account_statuses_cleanup_policy_enabled), select')
+    .querySelectorAll<HTMLInputElement | HTMLSelectElement>(
+      'input:not([type=hidden], #account_statuses_cleanup_policy_enabled), select',
+    )
     .forEach((input) => {
       setInputDisabled(input, !target.checked);
     });

app/javascript/flavours/glitch/features/ui/components/hashtag_menu_controller.tsx

@@ -4,11 +4,11 @@ import { useIntl, defineMessages } from 'react-intl';
 
 import { useLocation } from 'react-router-dom';
 
-import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
 } from 'react-overlays/esm/usePopper';
+import Overlay from 'react-overlays/Overlay';
 
 import { DropdownMenu } from 'flavours/glitch/components/dropdown_menu';
 import { useIdentity } from 'flavours/glitch/identity_context';

app/javascript/mastodon/components/alt_text_badge.tsx

@@ -2,11 +2,11 @@ import { useState, useCallback, useRef, useId } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
 } from 'react-overlays/esm/usePopper';
+import Overlay from 'react-overlays/Overlay';
 
 import { useSelectableClick } from 'mastodon/hooks/useSelectableClick';
 

app/javascript/mastodon/components/dropdown_menu.tsx

@@ -13,12 +13,12 @@ import { Link } from 'react-router-dom';
 
 import type { Map as ImmutableMap } from 'immutable';
 
-import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
   Placement,
 } from 'react-overlays/esm/usePopper';
+import Overlay from 'react-overlays/Overlay';
 
 import { fetchRelationships } from 'mastodon/actions/accounts';
 import {
@@ -90,7 +90,7 @@ export const DropdownMenuItemContent: React.FC<{ item: MenuItem }> = ({
   );
 };
 
-export const DropdownMenu = <Item = MenuItem,>({
+export const DropdownMenu = <Item = MenuItem>({
   items,
   loading,
   scrollable,

app/javascript/mastodon/components/hover_card_controller.tsx

@@ -2,11 +2,11 @@ import { useEffect, useRef, useState, useCallback } from 'react';
 
 import { useLocation } from 'react-router-dom';
 
-import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
 } from 'react-overlays/esm/usePopper';
+import Overlay from 'react-overlays/Overlay';
 
 import { HoverCardAccount } from 'mastodon/components/hover_card_account';
 import { useTimeout } from 'mastodon/hooks/useTimeout';

app/javascript/mastodon/features/ui/components/hashtag_menu_controller.tsx

@@ -4,11 +4,11 @@ import { useIntl, defineMessages } from 'react-intl';
 
 import { useLocation } from 'react-router-dom';
 
-import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
 } from 'react-overlays/esm/usePopper';
+import Overlay from 'react-overlays/Overlay';
 
 import { DropdownMenu } from 'mastodon/components/dropdown_menu';
 import { useIdentity } from 'mastodon/identity_context';