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

fix(nuxt): keep state in initial state instead of extracting it #7567

Merged
merged 4 commits into from Sep 16, 2022
Merged

fix(nuxt): keep state in initial state instead of extracting it #7567

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4300b8
fix(nuxt): keep `state` in initial state instead of extracting it
pi0 Sep 15, 2022
19783fb
avoid overriding state in plugin
pi0 Sep 15, 2022
c51ebde
update test
pi0 Sep 15, 2022
6b87f56
Merge remote-tracking branch 'origin/main' into fix/payload-state
pi0 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
1 change: 0 additions & 1 deletion packages/nuxt/src/app/plugins/payload.client.ts
View file
Open in desktop
Expand Up @@ -10,7 +10,6 @@ export default defineNuxtPlugin((nuxtApp) => {
const payload = await loadPayload(url)
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)
Expand Down
4 changes: 2 additions & 2 deletions packages/nuxt/src/core/runtime/nitro/renderer.ts
View file
Open in desktop
Expand Up @@ -296,9 +296,9 @@ function renderPayloadResponse (ssrContext: NuxtSSRContext) {
}

function splitPayload (ssrContext: NuxtSSRContext) {
const { data, state, prerenderedAt, ...initial } = ssrContext.payload
const { data, prerenderedAt, ...initial } = ssrContext.payload
return {
initial: { ...initial, prerenderedAt },
payload: { data, state, prerenderedAt }
payload: { data, prerenderedAt }
}
}
2 changes: 1 addition & 1 deletion test/basic.test.ts
View file
Open in desktop
Expand Up @@ -590,7 +590,7 @@ describe.skipIf(process.env.NUXT_TEST_DEV || isWindows)('payload rendering', ()
it('renders a payload', async () => {
const payload = await $fetch('/random/a/_payload.js', { responseType: 'text' })
expect(payload).toMatch(
/export default \{data:\{\$frand_a:\[[^\]]*\]\},state:\{"\$srandom:rand_a":\d*,"\$srandom:default":\d*\},prerenderedAt:\d*\}/
/export default \{data:\{\$frand_a:\[[^\]]*\]\},prerenderedAt:\d*\}/
)
})

Expand Down