Merge 8ce63aa707 into ba391f5fdf

packages/runtime-core/__tests__/hydration.spec.ts

@@ -2284,6 +2284,31 @@ describe('SSR hydration', () => {
       app.mount(container)
       expect(`Hydration style mismatch`).not.toHaveBeenWarned()
     })
+
+    test('style var with falsy values', () => {
+      const container = document.createElement('div')
+      container.innerHTML = `<div style="padding: 4px;--bar:;"></div>`
+      const app = createSSRApp({
+        setup() {
+          const value1 = ref<any>(null)
+          const value2 = ref('')
+          const value3 = ref<any>(undefined)
+          useCssVars(() => ({
+            foo: value1.value,
+            bar: value2.value,
+            baz: value3.value,
+          }))
+          return () => h(Child)
+        },
+      })
+      const Child = {
+        setup() {
+          return () => h('div', { style: 'padding: 4px' })
+        },
+      }
+      app.mount(container)
+      expect(`Hydration style mismatch`).not.toHaveBeenWarned()
+    })
   })
 
   describe('data-allow-mismatch', () => {

packages/runtime-core/src/hydration.ts

@@ -911,7 +911,7 @@ function toStyleMap(str: string): Map<string, string> {
     let [key, value] = item.split(':')
     key = key.trim()
     value = value && value.trim()
-    if (key && value) {
+    if (key) {
       styleMap.set(key, value)
     }
   }
@@ -945,10 +945,13 @@ function resolveCssVars(
   ) {
     const cssVars = instance.getCssVars()
     for (const key in cssVars) {
-      expectedMap.set(
+      const value = cssVars[key]
-        `--${getEscapedCssVarName(key, false)}`,
+      if (isRenderableAttrValue(value)) {
-        String(cssVars[key]),
+        expectedMap.set(
-      )
+          `--${getEscapedCssVarName(key, false)}`,
+          String(value).trim(),
+        )
+      }
     }
   }
   if (vnode === root && instance.parent) {