Merge pull request #1856 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 4 insertions, 2 deletions

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 91240aecf..020f2b4a0 100644
--- 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);
 });