root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix(compiler-ssr): correct the variable name generated by the generator (#2065)

This commit is contained in:
HcySunYang 2020-09-15 22:00:14 +08:00 committed by GitHub
parent 7455dca11c
commit aa8dc9a507
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/compiler-ssr/__tests__/ssrInjectCssVars.spec.ts
View File

@ -11,7 +11,7 @@ describe('ssr: inject <style vars>', () => {
const { ssrResolveCssVars: _ssrResolveCssVars, ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\") const { ssrResolveCssVars: _ssrResolveCssVars, ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\")
return function ssrRender(_ctx, _push, _parent, _attrs) { return function ssrRender(_ctx, _push, _parent, _attrs) {
const _cssVars = ssrResolveCssVars({ color: _ctx.color }) const _cssVars = _ssrResolveCssVars({ color: _ctx.color })
_push(\`<div\${_ssrRenderAttrs(_mergeProps(_attrs, _cssVars))}></div>\`) _push(\`<div\${_ssrRenderAttrs(_mergeProps(_attrs, _cssVars))}></div>\`)
}" }"
`) `)
@ -26,7 +26,7 @@ describe('ssr: inject <style vars>', () => {
"const { ssrResolveCssVars: _ssrResolveCssVars, ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\") "const { ssrResolveCssVars: _ssrResolveCssVars, ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\")
return function ssrRender(_ctx, _push, _parent, _attrs) { return function ssrRender(_ctx, _push, _parent, _attrs) {
const _cssVars = ssrResolveCssVars({ color: _ctx.color }) const _cssVars = _ssrResolveCssVars({ color: _ctx.color })
_push(\`<!--[--><div\${ _push(\`<!--[--><div\${
_ssrRenderAttrs(_cssVars) _ssrRenderAttrs(_cssVars)
}></div><div\${ }></div><div\${
@ -48,7 +48,7 @@ describe('ssr: inject <style vars>', () => {
return function ssrRender(_ctx, _push, _parent, _attrs) { return function ssrRender(_ctx, _push, _parent, _attrs) {
const _component_foo = _resolveComponent(\\"foo\\") const _component_foo = _resolveComponent(\\"foo\\")
const _cssVars = ssrResolveCssVars({ color: _ctx.color }) const _cssVars = _ssrResolveCssVars({ color: _ctx.color })
_push(\`<!--[--><div\${_ssrRenderAttrs(_cssVars)}></div>\`) _push(\`<!--[--><div\${_ssrRenderAttrs(_cssVars)}></div>\`)
_push(_ssrRenderComponent(_component_foo, _cssVars, null, _parent)) _push(_ssrRenderComponent(_component_foo, _cssVars, null, _parent))
_push(\`<!--]-->\`) _push(\`<!--]-->\`)
@ -66,7 +66,7 @@ describe('ssr: inject <style vars>', () => {
const { ssrResolveCssVars: _ssrResolveCssVars, ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\") const { ssrResolveCssVars: _ssrResolveCssVars, ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\")
return function ssrRender(_ctx, _push, _parent, _attrs) { return function ssrRender(_ctx, _push, _parent, _attrs) {
const _cssVars = ssrResolveCssVars({ color: _ctx.color }) const _cssVars = _ssrResolveCssVars({ color: _ctx.color })
if (_ctx.ok) { if (_ctx.ok) {
_push(\`<div\${_ssrRenderAttrs(_mergeProps(_attrs, _cssVars))}></div>\`) _push(\`<div\${_ssrRenderAttrs(_mergeProps(_attrs, _cssVars))}></div>\`)
} else { } else {
@ -91,7 +91,7 @@ describe('ssr: inject <style vars>', () => {
const { ssrResolveCssVars: _ssrResolveCssVars, ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\") const { ssrResolveCssVars: _ssrResolveCssVars, ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\")
return function ssrRender(_ctx, _push, _parent, _attrs) { return function ssrRender(_ctx, _push, _parent, _attrs) {
const _cssVars = ssrResolveCssVars({ color: _ctx.color }, \\"data-v-foo\\") const _cssVars = _ssrResolveCssVars({ color: _ctx.color }, \\"data-v-foo\\")
_push(\`<div\${_ssrRenderAttrs(_mergeProps(_attrs, _cssVars))} data-v-foo></div>\`) _push(\`<div\${_ssrRenderAttrs(_mergeProps(_attrs, _cssVars))} data-v-foo></div>\`)
}" }"
`) `)

2
packages/compiler-ssr/src/ssrCodegenTransform.ts
View File

@ -50,7 +50,7 @@ export function ssrCodegenTransform(ast: RootNode, options: CompilerOptions) {
) )
context.body.push( context.body.push(
createCompoundExpression([ createCompoundExpression([
`const _cssVars = ${ssrHelpers[SSR_RESOLVE_CSS_VARS]}(`, `const _cssVars = _${ssrHelpers[SSR_RESOLVE_CSS_VARS]}(`,
varsExp, varsExp,
options.scopeId ? `, ${JSON.stringify(options.scopeId)}` : ``, options.scopeId ? `, ${JSON.stringify(options.scopeId)}` : ``,
`)` `)`