Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' into glitch-soc/merge-upstream

Conflicts:
- `tsconfig.json`:
  Upstream changed the config to properly process imports.
  Glitch-soc had previously already done so.
  Changed the config to better match upstream.

tsconfig.json

@@ -8,14 +8,17 @@
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "baseUrl": ".",
+    "baseUrl": "./",
     "paths": {
-      "*": ["app/javascript/*"]
+      "*": ["app/javascript/*"],
+      "mastodon": ["app/javascript/mastodon"],
+      "mastodon/*": ["app/javascript/mastodon/*"]
     }
   },
   "include": [
     "app/javascript/mastodon",
-    "app/javascript/flavours/glitch",
-    "app/javascript/packs"
+    "app/javascript/packs",
+    "app/javascript/types",
+    "app/javascript/flavours/glitch"
   ]
 }