fix(compiler-core): dedupe renderSlot's default props (#4557)

vuejs · Sep 21, 2021 · 0448125 · 0448125 · transtone · Sep 24, 2021
1 parent ed6470c
commit 0448125
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/packages/compiler-core/__tests__/transforms/transformSlotOutlet.spec.ts b/packages/compiler-core/__tests__/transforms/transformSlotOutlet.spec.ts
@@ -346,6 +346,26 @@ describe('compiler: transform <slot> outlets', () => {
       callee: RENDER_SLOT,
       arguments: [`$slots`, `"default"`, `{}`, `undefined`, `true`]
     })
+    const fallback = parseWithSlots(`<slot>fallback</slot>`, {
+      slotted: false,
+      scopeId: 'foo'
+    })
+
+    const child = {
+      type: NodeTypes.JS_FUNCTION_EXPRESSION,
+      params: [],
+      returns: [
+        {
+          type: NodeTypes.TEXT,
+          content: `fallback`
+        }
+      ]
+    }
+    expect((fallback.children[0] as ElementNode).codegenNode).toMatchObject({
+      type: NodeTypes.JS_CALL_EXPRESSION,
+      callee: RENDER_SLOT,
+      arguments: [`$slots`, `"default"`, `{}`, child, `true`]
+    })
   })
 
   test(`error on unexpected custom directive on <slot>`, () => {

diff --git a/packages/compiler-core/src/transforms/transformSlotOutlet.ts b/packages/compiler-core/src/transforms/transformSlotOutlet.ts
@@ -20,29 +20,27 @@ export const transformSlotOutlet: NodeTransform = (node, context) => {
 
     const slotArgs: CallExpression['arguments'] = [
       context.prefixIdentifiers ? `_ctx.$slots` : `$slots`,
-      slotName
+      slotName,
+      '{}',
+      'undefined',
+      'true'
     ]
+    let expectedLen = 2
 
     if (slotProps) {
-      slotArgs.push(slotProps)
+      slotArgs[2] = slotProps
+      expectedLen = 3
     }
 
     if (children.length) {
-      if (!slotProps) {
-        slotArgs.push(`{}`)
-      }
-      slotArgs.push(createFunctionExpression([], children, false, false, loc))
+      slotArgs[3] = createFunctionExpression([], children, false, false, loc)
+      expectedLen = 4
     }
 
     if (context.scopeId && !context.slotted) {
-      if (!slotProps) {
-        slotArgs.push(`{}`)
-      }
-      if (!children.length) {
-        slotArgs.push(`undefined`)
-      }
-      slotArgs.push(`true`)
+      expectedLen = 5
     }
+    slotArgs.splice(expectedLen) // remove unused arguments
 
     node.codegenNode = createCallExpression(
       context.helper(RENDER_SLOT),