diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 14:33:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-12 14:33:14 +0100 |
commit | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (patch) | |
tree | 5cdf443e718788f8473148ce4d4205da54efbf04 /app/javascript/flavours/glitch/main.js | |
parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
parent | a808ac1fd8d4a42ee930bbb30cb6b58c810f828b (diff) |
Merge pull request #1920 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/main.js')
-rw-r--r-- | app/javascript/flavours/glitch/main.js | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/app/javascript/flavours/glitch/main.js b/app/javascript/flavours/glitch/main.js index f1e10df34..14a6effbb 100644 --- a/app/javascript/flavours/glitch/main.js +++ b/app/javascript/flavours/glitch/main.js @@ -2,6 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { setupBrowserNotifications } from 'flavours/glitch/actions/notifications'; import Mastodon, { store } from 'flavours/glitch/containers/mastodon'; +import { me } from 'flavours/glitch/initial_state'; import ready from 'flavours/glitch/ready'; const perf = require('flavours/glitch/performance'); @@ -19,23 +20,19 @@ function main() { ReactDOM.render(<Mastodon {...props} />, mountNode); store.dispatch(setupBrowserNotifications()); - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - const [{ Workbox }, { me }] = await Promise.all([ - import('workbox-window'), - import('flavours/glitch/initial_state'), - ]); - + if (process.env.NODE_ENV === 'production' && me && 'serviceWorker' in navigator) { + const { Workbox } = await import('workbox-window'); const wb = new Workbox('/sw.js'); + /** @type {ServiceWorkerRegistration} */ + let registration; try { - await wb.register(); + registration = await wb.register(); } catch (err) { console.error(err); - - return; } - if (me) { + if (registration) { const registerPushNotifications = await import('flavours/glitch/actions/push_notifications'); store.dispatch(registerPushNotifications.register()); |