adjustment: scoped slots must use <template>

yyx990803 · yyx990803 · commit 0458e2edb289 · 2016-11-20T12:03:43.000-05:00
diff --git a/src/compiler/parser/index.js b/src/compiler/parser/index.js
@@ -169,9 +169,10 @@ export function parse (
       if (currentParent && !element.forbidden) {
         if (element.else) { // else block
           processElse(element, currentParent)
-        } else if (element.slotTarget && element.slotScope) { // scoped slot
-          (currentParent.scopedSlots || (currentParent.scopedSlots = {}))[element.slotTarget] = element
+        } else if (element.slotScope) { // scoped slot
           currentParent.plain = false
+          const name = element.slotTarget || 'default'
+          ;(currentParent.scopedSlots || (currentParent.scopedSlots = {}))[name] = element
         } else {
           currentParent.children.push(element)
           element.parent = currentParent
@@ -356,6 +357,8 @@ function processSlot (el) {
     const slotTarget = getBindingAttr(el, 'slot')
     if (slotTarget) {
       el.slotTarget = slotTarget === '""' ? '"default"' : slotTarget
+    }
+    if (el.tag === 'template') {
       el.slotScope = getAndRemoveAttr(el, 'scope')
     }
   }
diff --git a/test/unit/features/component/component-scoped-slot.spec.js b/test/unit/features/component/component-scoped-slot.spec.js
@@ -1,30 +1,13 @@
 import Vue from 'vue'
 
-describe('Component scoped slot', () => {
-  it('default slot', () => {
-    const vm = new Vue({
-      template: `<test><span slot scope="props">{{ props.msg }}</span></test>`,
-      components: {
-        test: {
-          data () {
-            return { msg: 'hello' }
-          },
-          template: `
-            <div>
-              <slot :msg="msg"></slot>
-            </div>
-          `
-        }
-      }
-    }).$mount()
-    expect(vm.$el.innerHTML).toBe('<span>hello</span>')
-  })
-
-  it('normal element slot', done => {
+fdescribe('Component scoped slot', () => {
+  it('default slot', done => {
     const vm = new Vue({
       template: `
         <test ref="test">
-          <span slot="item" scope="props">{{ props.text }}</span>
+          <template scope="props">
+            <span>{{ props.msg }}</span>
+          </template>
         </test>
       `,
       components: {
@@ -34,7 +17,7 @@ describe('Component scoped slot', () => {
           },
           template: `
             <div>
-              <slot name="item" :text="msg"></slot>
+              <slot :msg="msg"></slot>
             </div>
           `
         }
@@ -204,7 +187,9 @@ describe('Component scoped slot', () => {
     const vm = new Vue({
       template: `
         <test ref="test">
-          <span slot="item" scope="props">{{ props.text || 'meh' }}</span>
+          <template slot="item" scope="props">
+            <span>{{ props.text || 'meh' }}</span>
+          </template>
         </test>
       `,
       components: {
