Skip to content

Commit

Permalink
fix(ssr): fix hydration error for slot outlet inside transition
Browse files Browse the repository at this point in the history
fix #3989
  • Loading branch information
yyx990803 committed May 12, 2022
1 parent da49c86 commit 9309b04
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 14 deletions.
13 changes: 13 additions & 0 deletions packages/compiler-ssr/__tests__/ssrSlotOutlet.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { compile } from '../src'
import { ssrHelpers, SSR_RENDER_SLOT_INNER } from '../src/runtimeHelpers'

describe('ssr: <slot>', () => {
test('basic', () => {
Expand Down Expand Up @@ -114,4 +115,16 @@ describe('ssr: <slot>', () => {
}"
`)
})

test('inside transition', () => {
const { code } = compile(`<transition><slot/></transition>`)
expect(code).toMatch(ssrHelpers[SSR_RENDER_SLOT_INNER])
expect(code).toMatchInlineSnapshot(`
"const { ssrRenderSlotInner: _ssrRenderSlotInner } = require(\\"vue/server-renderer\\")
return function ssrRender(_ctx, _push, _parent, _attrs) {
_ssrRenderSlotInner(_ctx.$slots, \\"default\\", {}, null, _push, _parent)
}"
`)
})
})
2 changes: 2 additions & 0 deletions packages/compiler-ssr/src/runtimeHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const SSR_INTERPOLATE = Symbol(`ssrInterpolate`)
export const SSR_RENDER_VNODE = Symbol(`ssrRenderVNode`)
export const SSR_RENDER_COMPONENT = Symbol(`ssrRenderComponent`)
export const SSR_RENDER_SLOT = Symbol(`ssrRenderSlot`)
export const SSR_RENDER_SLOT_INNER = Symbol(`ssrRenderSlotInner`)
export const SSR_RENDER_CLASS = Symbol(`ssrRenderClass`)
export const SSR_RENDER_STYLE = Symbol(`ssrRenderStyle`)
export const SSR_RENDER_ATTRS = Symbol(`ssrRenderAttrs`)
Expand All @@ -24,6 +25,7 @@ export const ssrHelpers = {
[SSR_RENDER_VNODE]: `ssrRenderVNode`,
[SSR_RENDER_COMPONENT]: `ssrRenderComponent`,
[SSR_RENDER_SLOT]: `ssrRenderSlot`,
[SSR_RENDER_SLOT_INNER]: `ssrRenderSlotInner`,
[SSR_RENDER_CLASS]: `ssrRenderClass`,
[SSR_RENDER_STYLE]: `ssrRenderStyle`,
[SSR_RENDER_ATTRS]: `ssrRenderAttrs`,
Expand Down
30 changes: 24 additions & 6 deletions packages/compiler-ssr/src/transforms/ssrTransformSlotOutlet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ import {
processSlotOutlet,
createCallExpression,
SlotOutletNode,
createFunctionExpression
createFunctionExpression,
NodeTypes,
ElementTypes,
resolveComponentType,
TRANSITION
} from '@vue/compiler-dom'
import { SSR_RENDER_SLOT } from '../runtimeHelpers'
import { SSR_RENDER_SLOT, SSR_RENDER_SLOT_INNER } from '../runtimeHelpers'
import {
SSRTransformContext,
processChildrenAsStatement
Expand All @@ -31,10 +35,24 @@ export const ssrTransformSlotOutlet: NodeTransform = (node, context) => {
args.push(`"${context.scopeId}-s"`)
}

node.ssrCodegenNode = createCallExpression(
context.helper(SSR_RENDER_SLOT),
args
)
let method = SSR_RENDER_SLOT

// #3989
// check if this is a single slot inside a transition wrapper - since
// transition will unwrap the slot fragment into a single vnode at runtime,
// we need to avoid rendering the slot as a fragment.
const parent = context.parent
if (
parent &&
parent.type === NodeTypes.ELEMENT &&
parent.tagType === ElementTypes.COMPONENT &&
resolveComponentType(parent, context, true) === TRANSITION &&
parent.children.filter(c => c.type === NodeTypes.ELEMENT).length === 1
) {
method = SSR_RENDER_SLOT_INNER
}

node.ssrCodegenNode = createCallExpression(context.helper(method), args)
}
}

Expand Down
12 changes: 6 additions & 6 deletions packages/runtime-core/src/hydration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export function createHydrationFunctions(
nextNode = onMismatch()
} else {
if ((node as Text).data !== vnode.children) {
hasMismatch = true
hasMismatch = true; debugger

This comment has been minimized.

Copy link
@andylizi

andylizi May 12, 2022

Are these debugger statement meant to be here?

__DEV__ &&
warn(
`Hydration text mismatch:` +
Expand Down Expand Up @@ -351,7 +351,7 @@ export function createHydrationFunctions(
)
let hasWarned = false
while (next) {
hasMismatch = true
hasMismatch = true; debugger
if (__DEV__ && !hasWarned) {
warn(
`Hydration children mismatch in <${vnode.type as string}>: ` +
Expand All @@ -366,7 +366,7 @@ export function createHydrationFunctions(
}
} else if (shapeFlag & ShapeFlags.TEXT_CHILDREN) {
if (el.textContent !== vnode.children) {
hasMismatch = true
hasMismatch = true; debugger
__DEV__ &&
warn(
`Hydration text content mismatch in <${
Expand Down Expand Up @@ -411,7 +411,7 @@ export function createHydrationFunctions(
} else if (vnode.type === Text && !vnode.children) {
continue
} else {
hasMismatch = true
hasMismatch = true; debugger
if (__DEV__ && !hasWarned) {
warn(
`Hydration children mismatch in <${container.tagName.toLowerCase()}>: ` +
Expand Down Expand Up @@ -465,7 +465,7 @@ export function createHydrationFunctions(
} else {
// fragment didn't hydrate successfully, since we didn't get a end anchor
// back. This should have led to node/children mismatch warnings.
hasMismatch = true
hasMismatch = true; debugger
// since the anchor is missing, we need to create one and insert it
insert((vnode.anchor = createComment(`]`)), container, next)
return next
Expand All @@ -480,7 +480,7 @@ export function createHydrationFunctions(
slotScopeIds: string[] | null,
isFragment: boolean
): Node | null => {
hasMismatch = true
hasMismatch = true; debugger
__DEV__ &&
warn(
`Hydration node mismatch:\n- Client vnode:`,
Expand Down
22 changes: 21 additions & 1 deletion packages/server-renderer/src/helpers/ssrRenderSlot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,27 @@ export function ssrRenderSlot(
) {
// template-compiled slots are always rendered as fragments
push(`<!--[-->`)
ssrRenderSlotInner(
slots,
slotName,
slotProps,
fallbackRenderFn,
push,
parentComponent,
slotScopeId
)
push(`<!--]-->`)
}

export function ssrRenderSlotInner(
slots: Slots | SSRSlots,
slotName: string,
slotProps: Props,
fallbackRenderFn: (() => void) | null,
push: PushFn,
parentComponent: ComponentInternalInstance,
slotScopeId?: string
) {
const slotFn = slots[slotName]
if (slotFn) {
const slotBuffer: SSRBufferItem[] = []
Expand Down Expand Up @@ -59,7 +80,6 @@ export function ssrRenderSlot(
} else if (fallbackRenderFn) {
fallbackRenderFn()
}
push(`<!--]-->`)
}

const commentRE = /^<!--.*-->$/
Expand Down
2 changes: 1 addition & 1 deletion packages/server-renderer/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export {
// internal runtime helpers
export { renderVNode as ssrRenderVNode } from './render'
export { ssrRenderComponent } from './helpers/ssrRenderComponent'
export { ssrRenderSlot } from './helpers/ssrRenderSlot'
export { ssrRenderSlot, ssrRenderSlotInner } from './helpers/ssrRenderSlot'
export { ssrRenderTeleport } from './helpers/ssrRenderTeleport'
export {
ssrRenderClass,
Expand Down

0 comments on commit 9309b04

Please sign in to comment.