Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.

Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`

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

@@ -1,4 +1,4 @@
-import 'packs/public-path';
+import '@/entrypoints/public-path';
 import { createRoot } from 'react-dom/client';
 
 import Rails from '@rails/ujs';

app/javascript/flavours/glitch/entrypoints/application.js

@@ -1,4 +1,4 @@
-import 'packs/public-path';
+import '@/entrypoints/public-path';
 
 import { start } from 'flavours/glitch/common';
 import { loadLocale } from 'flavours/glitch/locales';

app/javascript/flavours/glitch/entrypoints/common.js

@@ -1,7 +1,7 @@
 /* This file is a hack to have something more reliable than the upstream `common` tag
   that is implicitly generated as the common chunk through webpack's `splitChunks` config */
 
-import 'packs/public-path';
+import '@/entrypoints/public-path';
 import 'font-awesome/css/font-awesome.css';
 
 // This is a hack to ensures that webpack compiles our images.

app/javascript/flavours/glitch/entrypoints/error.js

@@ -1,4 +1,4 @@
-import 'packs/public-path';
+import '@/entrypoints/public-path';
 import ready from 'flavours/glitch/ready';
 
 ready(() => {

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

@@ -1,6 +1,6 @@
 import { createRoot } from 'react-dom/client';
 
-import 'packs/public-path';
+import '@/entrypoints/public-path';
 
 import { IntlMessageFormat } from 'intl-messageformat';
 import type { MessageDescriptor, PrimitiveType } from 'react-intl';

app/javascript/flavours/glitch/entrypoints/remote_interaction_helper.ts

@@ -8,7 +8,7 @@ and performs no other task.
 
 */
 
-import 'packs/public-path';
+import '@/entrypoints/public-path';
 
 import axios from 'axios';
 

app/javascript/flavours/glitch/entrypoints/share.jsx

@@ -1,4 +1,4 @@
-import 'packs/public-path';
+import '@/entrypoints/public-path';
 import { createRoot } from 'react-dom/client';
 
 import { start } from 'flavours/glitch/common';

app/javascript/flavours/glitch/entrypoints/sign_up.js

@@ -1,4 +1,4 @@
-import 'packs/public-path';
+import '@/entrypoints/public-path';
 import axios from 'axios';
 
 import ready from 'flavours/glitch/ready';

app/javascript/flavours/glitch/theme.yml

@@ -1,5 +1,5 @@
 #  (REQUIRED) The directory which contains the entry point files.
-pack_directory: app/javascript/flavours/glitch/packs
+pack_directory: app/javascript/flavours/glitch/entrypoints
 
 #  (OPTIONAL) Define files to be preloaded when a logged-in user is
 #  visiting the main web app.

app/javascript/flavours/vanilla/theme.yml

@@ -1,5 +1,5 @@
 #  (REQUIRED) The directory which contains the pack files.
-pack_directory: app/javascript/packs
+pack_directory: app/javascript/entrypoints
 
 #  (OPTIONAL) Define files to be preloaded when a logged-in user is
 #  visiting the main web app.

app/javascript/styles/mastodon/admin.scss

@@ -10,6 +10,13 @@ $content-width: 840px;
   width: 100%;
   min-height: 100vh;
 
+  .icon {
+    width: 16px;
+    height: 16px;
+    vertical-align: middle;
+    margin: 0 2px;
+  }
+
   .sidebar-wrapper {
     min-height: 100vh;
     overflow: hidden;