Skip to content

Commit

Permalink
fix(ssr): forward helpers provided by CSS v-bind (#6489)
Browse files Browse the repository at this point in the history
fix #6201
  • Loading branch information
antfu authored Aug 29, 2022
1 parent 81a7819 commit 2024d11
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
22 changes: 22 additions & 0 deletions packages/compiler-ssr/__tests__/ssrInjectCssVars.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { BindingTypes } from '@vue/compiler-dom'
import { compile } from '../src'

describe('ssr: inject <style vars>', () => {
Expand Down Expand Up @@ -111,4 +112,25 @@ describe('ssr: inject <style vars>', () => {
}"
`)
})

test('inject helpers', () => {
const result = compile(`<div/>`, {
inline: true,
bindingMetadata: { dynamic: BindingTypes.SETUP_MAYBE_REF },
ssrCssVars: '{ "--hash": (dynamic) }'
})

expect(result.code).toMatchInlineSnapshot(`
"(_ctx, _push, _parent, _attrs) => {
const _cssVars = { style: { \\"--hash\\": (_unref(dynamic)) }}
_push(\`<div\${_ssrRenderAttrs(_mergeProps(_attrs, _cssVars))}></div>\`)
}"
`)
expect(result.ast.helpers).toMatchInlineSnapshot(`
Array [
Symbol(mergeProps),
Symbol(unref),
]
`)
})
})
6 changes: 5 additions & 1 deletion packages/compiler-ssr/src/ssrCodegenTransform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,17 @@ export function ssrCodegenTransform(ast: RootNode, options: CompilerOptions) {
// we do this instead of inlining the expression to ensure the vars are
// only resolved once per render
if (options.ssrCssVars) {
const cssContext = createTransformContext(createRoot([]), options)
const varsExp = processExpression(
createSimpleExpression(options.ssrCssVars, false),
createTransformContext(createRoot([]), options)
cssContext
)
context.body.push(
createCompoundExpression([`const _cssVars = { style: `, varsExp, `}`])
)
Array.from(cssContext.helpers.keys()).forEach(helper =>
ast.helpers.push(helper)
)
}

const isFragment =
Expand Down

0 comments on commit 2024d11

Please sign in to comment.