mirror of https://github.com/vuejs/core.git
fix(ssr): avoid computed being accidentally cached before server render (#9688)
close #5300
This commit is contained in:
parent
8d74ca0e6f
commit
30d5d93a92
|
@ -17,7 +17,10 @@ import {
|
||||||
renderSlot,
|
renderSlot,
|
||||||
onErrorCaptured,
|
onErrorCaptured,
|
||||||
onServerPrefetch,
|
onServerPrefetch,
|
||||||
getCurrentInstance
|
getCurrentInstance,
|
||||||
|
reactive,
|
||||||
|
computed,
|
||||||
|
createSSRApp
|
||||||
} from 'vue'
|
} from 'vue'
|
||||||
import { escapeHtml } from '@vue/shared'
|
import { escapeHtml } from '@vue/shared'
|
||||||
import { renderToString } from '../src/renderToString'
|
import { renderToString } from '../src/renderToString'
|
||||||
|
@ -1140,5 +1143,47 @@ function testRender(type: string, render: typeof renderToString) {
|
||||||
expect(renderError).toBe(null)
|
expect(renderError).toBe(null)
|
||||||
expect((capturedError as unknown as Error).message).toBe('An error')
|
expect((capturedError as unknown as Error).message).toBe('An error')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('computed reactivity during SSR with onServerPrefetch', async () => {
|
||||||
|
const store = {
|
||||||
|
// initial state could be hydrated
|
||||||
|
state: reactive({ items: null as null | string[] }),
|
||||||
|
|
||||||
|
// pretend to fetch some data from an api
|
||||||
|
async fetchData() {
|
||||||
|
this.state.items = ['hello', 'world']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const getterSpy = vi.fn()
|
||||||
|
|
||||||
|
const App = defineComponent(() => {
|
||||||
|
const msg = computed(() => {
|
||||||
|
getterSpy()
|
||||||
|
return store.state.items?.join(' ')
|
||||||
|
})
|
||||||
|
|
||||||
|
// If msg value is falsy then we are either in ssr context or on the client
|
||||||
|
// and the initial state was not modified/hydrated.
|
||||||
|
// In both cases we need to fetch data.
|
||||||
|
onServerPrefetch(() => store.fetchData())
|
||||||
|
|
||||||
|
// simulate the read from a composable (e.g. filtering a list of results)
|
||||||
|
msg.value
|
||||||
|
|
||||||
|
return () => h('div', null, msg.value)
|
||||||
|
})
|
||||||
|
|
||||||
|
const app = createSSRApp(App)
|
||||||
|
|
||||||
|
// in real world serve this html and append store state for hydration on client
|
||||||
|
const html = await renderToString(app)
|
||||||
|
|
||||||
|
expect(html).toMatch('hello world')
|
||||||
|
|
||||||
|
// should only be called twice since access should be cached
|
||||||
|
// during the render phase
|
||||||
|
expect(getterSpy).toHaveBeenCalledTimes(2)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@ test('computed reactivity during SSR', async () => {
|
||||||
// In both cases we need to fetch data.
|
// In both cases we need to fetch data.
|
||||||
if (!msg.value) await store.fetchData()
|
if (!msg.value) await store.fetchData()
|
||||||
|
|
||||||
expect(msg.value).toBe('hello world')
|
|
||||||
return () => h('div', null, msg.value + msg.value + msg.value)
|
return () => h('div', null, msg.value + msg.value + msg.value)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -144,7 +144,10 @@ function renderComponentSubTree(
|
||||||
// perf: enable caching of computed getters during render
|
// perf: enable caching of computed getters during render
|
||||||
// since there cannot be state mutations during render.
|
// since there cannot be state mutations during render.
|
||||||
for (const e of instance.scope.effects) {
|
for (const e of instance.scope.effects) {
|
||||||
if (e.computed) e.computed._cacheable = true
|
if (e.computed) {
|
||||||
|
e.computed._dirty = true
|
||||||
|
e.computed._cacheable = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const ssrRender = instance.ssrRender || comp.ssrRender
|
const ssrRender = instance.ssrRender || comp.ssrRender
|
||||||
|
|
Loading…
Reference in New Issue