Merge branch 'main' into glitch-soc/merge-upstream

2022-10-08 15:49:40 +02:00
parent 2c8d1880cc 6580ac7241
commit 46224385e2
110 changed files with 495 additions and 474 deletions
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -4,8 +4,10 @@ import { start } from '../mastodon/common';

 start();

-loadPolyfills().then(() => {
-  require('../mastodon/main').default();
+loadPolyfills().then(async () => {
+  const { default: main } = await import('mastodon/main');
+
+  return main();
 }).catch(e => {
  console.error(e);
 });