Skip to content

Commit

Permalink
fix(ssr): fix ssr render output for fragment in slots
Browse files Browse the repository at this point in the history
fix #5859
  • Loading branch information
yyx990803 committed May 17, 2022
1 parent cbeb9f2 commit 70c2d5b
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 2 deletions.
86 changes: 86 additions & 0 deletions packages/server-renderer/__tests__/ssrSlot.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/**
* @jest-environment node
*/

import { createApp } from 'vue'
import { renderToString } from '../src/renderToString'

const components = {
one: {
template: `<div><slot/></div>`
}
}

describe('ssr: slot', () => {
test('text slot', async () => {
expect(
await renderToString(
createApp({
components,
template: `<one>hello</one>`
})
)
).toBe(`<div><!--[-->hello<!--]--></div>`)
})

test('element slot', async () => {
expect(
await renderToString(
createApp({
components,
template: `<one><div>hi</div></one>`
})
)
).toBe(`<div><!--[--><div>hi</div><!--]--></div>`)
})

test('empty slot', async () => {
expect(
await renderToString(
createApp({
components: {
one: {
template: `<div><slot/></div>`
}
},
template: `<one><template v-if="false"/></one>`
})
)
).toBe(`<div><!--[--><!--]--></div>`)
})

test('multiple elements', async () => {
expect(
await renderToString(
createApp({
components,
template: `<one><div>one</div><div>two</div></one>`
})
)
).toBe(`<div><!--[--><div>one</div><div>two</div><!--]--></div>`)
})

test('fragment slot (template v-if)', async () => {
expect(
await renderToString(
createApp({
components,
template: `<one><template v-if="true">hello</template></one>`
})
)
).toBe(`<div><!--[--><!--[-->hello<!--]--><!--]--></div>`)
})

test('fragment slot (template v-if + multiple elements)', async () => {
expect(
await renderToString(
createApp({
components,
template: `<one><template v-if="true"><div>one</div><div>two</div></template></one>`
})
)
).toBe(
`<div><!--[--><!--[--><div>one</div><div>two</div><!--]--><!--]--></div>`
)
})
})
4 changes: 2 additions & 2 deletions packages/server-renderer/src/helpers/ssrRenderSlot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function ssrRenderSlotInner(
}
}

const commentRE = /^<!--.*-->$/
const commentRE = /<!--.*?-->/g
function isComment(item: SSRBufferItem) {
return typeof item === 'string' && commentRE.test(item)
return typeof item === 'string' && !item.replace(commentRE, '').trim()
}

0 comments on commit 70c2d5b

Please sign in to comment.