Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

fix(nuxt): load payload after middleware and once final route is resolved #7574

Merged
merged 2 commits into from Sep 16, 2022
Merged

fix(nuxt): load payload after middleware and once final route is resolved #7574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f4fdee
fix(nuxt): apply data/state from cache immediately before route resolves
danielroe Sep 15, 2022
5a89c53
chore: update comment
danielroe Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions packages/nuxt/src/app/plugins/payload.client.ts
View file
Open in desktop
@@ -1,22 +1,21 @@
import { defineNuxtPlugin, loadPayload, addRouteMiddleware, isPrerendered } from '#app'
import { defineNuxtPlugin, loadPayload, isPrerendered, useRouter } from '#app'

export default defineNuxtPlugin((nuxtApp) => {
// Only enable behavior if initial page is prerendered
// TOOD: Support hybrid and dev
if (!isPrerendered()) {
return
}
const prefetchPayload = async (url: string) => {
const payload = await loadPayload(url)

// Load payload into cache
nuxtApp.hooks.hook('link:prefetch', to => loadPayload(to))

// Load payload after middleware & once final route is resolved
useRouter().beforeResolve(async (to, from) => {
if (to.path === from.path) { return }
const payload = await loadPayload(to.path)
if (!payload) { return }
Object.assign(nuxtApp.payload.data, payload.data)
Object.assign(nuxtApp.payload.state, payload.state)
}
nuxtApp.hooks.hook('link:prefetch', async (to) => {
await prefetchPayload(to)
})
addRouteMiddleware(async (to, from) => {
if (to.path === from.path) { return }
await prefetchPayload(to.path)
})
})