theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip: fix tests

Browse Source
This commit is contained in:
Evan You 2020-05-15 17:05:26 -04:00
parent dc229bcda4
commit b26976b6d8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/runtime-core/src/hydration.ts
View File

@ -118,16 +118,17 @@ export function createHydrationFunctions(
return onMismatch() return onMismatch()
} }
// determine anchor, adopt content // determine anchor, adopt content
let content = ''
let cur = node let cur = node
// if the static vnode has its content stripped during build,
// adopt it from the server-rendered HTML.
const needToAdoptContent = !(vnode.children as string).length
for (let i = 0; i < vnode.staticCount; i++) { for (let i = 0; i < vnode.staticCount; i++) {
content += (cur as Element).outerHTML if (needToAdoptContent) vnode.children += (cur as Element).outerHTML
if (i === vnode.staticCount - 1) { if (i === vnode.staticCount - 1) {
vnode.anchor = cur vnode.anchor = cur
} }
cur = nextSibling(cur)! cur = nextSibling(cur)!
} }
vnode.children = content
return cur return cur
case Fragment: case Fragment:
if (!isFragmentStart) { if (!isFragmentStart) {

2
packages/server-renderer/__tests__/renderToString.spec.ts
View File

@ -536,7 +536,7 @@ describe('ssr: renderToString', () => {
test('Static', async () => { test('Static', async () => {
const content = `<div id="ok">hello<span>world</span></div>` const content = `<div id="ok">hello<span>world</span></div>`
expect(await renderToString(createStaticVNode(content))).toBe(content) expect(await renderToString(createStaticVNode(content, 1))).toBe(content)
}) })
}) })