(pwa) add the new version component from vite pwa plugin

This commit is contained in:
Julien Calixte
2023-07-08 18:47:59 +02:00
parent fe2ba2d82d
commit 5d7a7fab0e
5 changed files with 66 additions and 67 deletions

View File

@@ -1,3 +0,0 @@
import { createEventBus } from 'retrobus'
export const serviceWorkerBusEvent = createEventBus<void>('new-version')

View File

@@ -1,32 +1,50 @@
<script setup lang="ts">
import { useRegisterSW } from 'virtual:pwa-register/vue'
import { ref } from 'vue'
const { offlineReady, needRefresh, updateServiceWorker } = useRegisterSW()
const close = async () => {
offlineReady.value = false
needRefresh.value = false
}
const devMode = ref(import.meta.env.DEV)
</script>
<template>
<aside v-if="hasNewVersion" class="new-version">
<button class="button is-primary" @click="reload">
new version available
<div
v-if="devMode || offlineReady || needRefresh"
class="pwa-toast"
role="alert"
>
<div>
<span v-if="offlineReady">App ready to work offline </span>
<span v-else>
New content available, click on reload button to update.
</span>
</div>
<button
class="button is-primary"
v-if="needRefresh"
@click="updateServiceWorker()"
>
Reload
</button>
</aside>
<button class="button" @click="close">Close</button>
</div>
</template>
<script lang="ts">
import { serviceWorkerBusEvent } from '@/bus/serviceWorkerEventBus'
import { defineComponent, onMounted, ref } from 'vue'
export default defineComponent({
name: 'NewVersion',
setup() {
const hasNewVersion = ref(false)
onMounted(() => {
serviceWorkerBusEvent.addEventBusListener(
() => {
hasNewVersion.value = true
},
{
once: true,
retro: true
}
)
})
return { hasNewVersion, reload: () => location.reload() }
}
})
</script>
<style scoped>
.pwa-toast {
position: fixed;
right: 0;
bottom: 0;
margin: 1rem;
padding: 0.5rem;
width: 200px;
color: var(--primary-color);
border: var(--primary-color) 2px solid;
border-radius: 4px;
background-color: var(--background-color);
}
</style>

View File

@@ -19,7 +19,8 @@ $light-link: lighten($link, 45%);
$family-primary: 'Courier Prime', monospace;
:root {
--font-family: var(#{$family-primary});
--primary-color: #{$primary};
--font-family: #{$family-primary};
--font-color: #4a4a4a;
--light-link: #{$light-link};
--background-color: #ffffff;

View File

@@ -1,18 +1,9 @@
<template>
<div v-if="!user || !repo" class="home content">
<authorize-user class="authorize" />
<new-version class="new-version" />
<welcome-world />
</div>
<flux-note v-else :key="routeKey" :user="user" :repo="repo" />
</template>
<script lang="ts">
import { defineComponent, defineAsyncComponent, computed } from 'vue'
import { useQueryStackedNotes } from '@/hooks/useQueryStackedNotes.hook'
import NewVersion from '@/components/NewVersion.vue'
<script setup lang="ts">
import AuthorizeUser from '@/components/AuthorizeUser.vue'
import NewVersion from '@/components/NewVersion.vue'
import { useComputeBacklinks } from '@/hooks/useComputeBacklinks.hook'
import { useQueryStackedNotes } from '@/hooks/useQueryStackedNotes.hook'
import { computed, defineAsyncComponent } from 'vue'
const FluxNote = defineAsyncComponent(() => import('@/components/FluxNote.vue'))
@@ -20,30 +11,22 @@ const WelcomeWorld = defineAsyncComponent(
() => import('@/components/WelcomeWorld.vue')
)
export default defineComponent({
name: 'HomeApp',
components: {
WelcomeWorld,
FluxNote,
NewVersion,
AuthorizeUser
},
props: {
user: { type: String, required: false, default: '' },
repo: { type: String, required: false, default: '' }
},
setup(props) {
const { resetStackedNotes } = useQueryStackedNotes()
useComputeBacklinks()
const props = defineProps<{ user: string; repo: string }>()
return {
resetStackedNotes,
routeKey: computed(() => `${props.user}-${props.repo}`)
}
}
})
useQueryStackedNotes()
useComputeBacklinks()
const routeKey = computed(() => `${props.user}-${props.repo}`)
</script>
<template>
<div v-if="!user || !repo" class="home content">
<authorize-user class="authorize" />
<welcome-world />
</div>
<flux-note v-else :key="routeKey" :user="user" :repo="repo" />
<new-version class="new-version" />
</template>
<style lang="scss" scoped>
.home {
display: flex;

View File

@@ -12,7 +12,7 @@
"sourceMap": true,
"baseUrl": ".",
"resolveJsonModule": true,
"types": ["node", "vite/client"],
"types": ["node", "vite/client", "vite-plugin-pwa/vue"],
"paths": {
"@/*": ["src/*"]
},