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

Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.

app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts

@@ -3,7 +3,6 @@
 // emojiIndex.search functionality.
 import type { BaseEmoji } from 'emoji-mart';
 import type { Emoji } from 'emoji-mart/dist-es/utils/data';
-// eslint-disable-next-line import/no-unresolved
 import emojiCompressed from 'virtual:mastodon-emoji-compressed';
 import type {
   Search,

app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts

@@ -2,7 +2,6 @@
 // (i.e. the svg filename) and a shortCode intended to be shown
 // as a "title" attribute in an HTML element (aka tooltip).
 
-// eslint-disable-next-line import/no-unresolved
 import emojiCompressed from 'virtual:mastodon-emoji-compressed';
 import type {
   FilenameData,