Skip to content

Commit

Permalink
fix: suspend errors by making sure there is always one node, plus cle…
Browse files Browse the repository at this point in the history
…anup deps a bit
  • Loading branch information
MiniDigger committed Jan 20, 2024
1 parent 811cbde commit 0d738d5
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 44 deletions.
10 changes: 2 additions & 8 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"@headlessui/vue": "1.7.17",
"@intlify/unplugin-vue-i18n": "2.0.0",
"@pinia/nuxt": "0.5.1",
"@unhead/vue": "1.8.10",
"@vuelidate/core": "2.0.3",
"@vuelidate/validators": "2.0.4",
"@vueuse/components": "10.7.2",
Expand All @@ -52,7 +51,6 @@
"qs": "6.11.2",
"rapidoc": "9.3.4",
"universal-cookie": "6.1.1",
"vue": "3.4.15",
"vue-advanced-cropper": "2.8.8",
"vue-chartjs": "5.3.0",
"vue-i18n": "9.9.0",
Expand All @@ -74,9 +72,7 @@
"@types/nprogress": "0.2.3",
"@types/prismjs": "1.26.3",
"@types/qs": "6.9.11",
"@types/swagger-ui-dist": "3.30.4",
"@unocss/nuxt": "0.58.3",
"@vue/compiler-sfc": "3.4.15",
"@vue/eslint-config-typescript": "12.0.0",
"eslint": "8.56.0",
"eslint-config-prettier": "9.1.0",
Expand All @@ -102,13 +98,11 @@
"vue-tsc": "1.8.27"
},
"comments": {
"hookable": "Hookable 5.5 seems to break with nuxt...",
"untyped": "https://github.com/unjs/untyped/issues/123"
"hookable": "Hookable 5.5 seems to break with nuxt..."
},
"pnpm": {
"overrides": {
"hookable": "5.4.2",
"untyped": "1.4.0"
"hookable": "5.4.2"
}
}
}
38 changes: 13 additions & 25 deletions frontend/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions frontend/src/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ onErrorCaptured((err) => {
</script>

<template>
<NuxtLayout>
<NuxtPage />
</NuxtLayout>
<div>
<NuxtLayout>
<NuxtPage />
</NuxtLayout>
</div>
</template>
14 changes: 9 additions & 5 deletions frontend/src/pages/[user].vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,13 @@ async function cb(u: Ref<User | null>) {
</script>

<template>
<router-view v-if="!blocking || user" v-slot="{ Component }">
<Suspense>
<component :is="Component" :user="user" :organization="organization" />
</Suspense>
</router-view>
<div>
<router-view v-if="!blocking || user" v-slot="{ Component }">
<Suspense>
<div>
<component :is="Component" :user="user" :organization="organization" />
</div>
</Suspense>
</router-view>
</div>
</template>
4 changes: 3 additions & 1 deletion frontend/src/pages/[user]/[project].vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ provide("updateProjectPages", function (pages: HangarProjectPage[]) {
<ProjectNav :project="project" />
<router-view v-slot="{ Component }">
<Suspense>
<component :is="Component" v-model:project="project" :user="user" />
<div>
<component :is="Component" v-model:project="project" :user="user" />
</div>
<template #fallback>
<Delayed> Loading... </Delayed>
</template>
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/pages/[user]/[project]/versions/[version].vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ const versionPlatforms = computed<Set<Platform>>(() => {
<template>
<router-view v-slot="{ Component }">
<Suspense>
<component :is="Component" :project="project" :version="version" :version-platforms="versionPlatforms" />
<div>
<component :is="Component" :project="project" :version="version" :version-platforms="versionPlatforms" />
</div>
<template #fallback> <Delayed> Loading... </Delayed> </template>
</Suspense>
</router-view>
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/pages/auth/settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ useHead(useSeo("Settings", null, route, null));
<Tabs :tabs="tabs" router>
<router-view v-slot="{ Component }">
<Suspense>
<component :is="Component" :settings="settings" @refresh-settings="refreshSettings" @open-email-confirm-modal="emailConfirmModal.isOpen = true" />
<div>
<component :is="Component" :settings="settings" @refresh-settings="refreshSettings" @open-email-confirm-modal="emailConfirmModal.isOpen = true" />
</div>
<template #fallback><Delayed> Loading... </Delayed></template>
</Suspense>
</router-view>
Expand Down

0 comments on commit 0d738d5

Please sign in to comment.