chore: improve code

vuejs · Dec 1, 2022 · 4e22e8f · 4e22e8f
1 parent a38a08d
commit 4e22e8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/packages/runtime-core/src/directives.ts b/packages/runtime-core/src/directives.ts
@@ -11,7 +11,7 @@ return withDirectives(h(comp), [
 ])
 */
 
-import { mergeProps, VNode } from './vnode'
+import { VNode } from './vnode'
 import { isFunction, EMPTY_OBJ, isBuiltInDirective } from '@vue/shared'
 import { warn } from './warning'
 import { ComponentInternalInstance, Data, getExposeProxy } from './component'
@@ -105,24 +105,14 @@ export function withDirectives<T extends VNode>(
       if (dir.deep) {
         traverse(value)
       }
-      const binding = {
+      bindings.push({
         dir,
         instance,
         value,
         oldValue: void 0,
         arg,
         modifiers
-      }
-
-      // #6123
-      // apply ssr props to the the fallback vnode-based branch in ssr
-      if (dir.getSSRProps) {
-        vnode.props = mergeProps(
-          vnode.props || {},
-          dir.getSSRProps(binding, vnode) || {}
-        )
-      }
-      bindings.push(binding)
+      })
     }
   }
   return vnode

diff --git a/packages/server-renderer/src/render.ts b/packages/server-renderer/src/render.ts
@@ -218,7 +218,10 @@ export function renderVNode(
   parentComponent: ComponentInternalInstance,
   slotScopeId?: string
 ) {
-  const { type, shapeFlag, children } = vnode
+  const { type, shapeFlag, children, dirs, props } = vnode
+  if (dirs) {
+    vnode.props = applySSRDirectives(vnode, props, dirs)
+  }
   switch (type) {
     case Text:
       push(escapeHtml(children as string))