From 216dbaedaf587db834cfdd53b896e9c7e1284d9c Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 4 Oct 2022 01:15:47 +0900
Subject: Disable push notification when not logged in (#19272)

---
 app/javascript/packs/application.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/javascript/packs/application.js')

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 91240aecf..0851f69b6 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 } = import('mastodon/main');
+
+  return main();
 }).catch(e => {
   console.error(e);
 });
-- 
cgit 


From fc3d248df770024b5ce0f33d93029d71f5051e43 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 4 Oct 2022 06:08:38 +0900
Subject: Fix missing await (#19273)

---
 app/javascript/packs/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/javascript/packs/application.js')

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 0851f69b6..020f2b4a0 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -5,7 +5,7 @@ import { start } from '../mastodon/common';
 start();
 
 loadPolyfills().then(async () => {
-  const { default: main } = import('mastodon/main');
+  const { default: main } = await import('mastodon/main');
 
   return main();
 }).catch(e => {
-- 
cgit