revert: feat: expose all scoped slots on this.$slots

This reverts commit 0129b0e.
vuejs · Feb 6, 2019 · d5ade28 · d5ade28
1 parent 7bc88f3
commit d5ade28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/src/core/vdom/helpers/normalize-scoped-slots.js b/src/core/vdom/helpers/normalize-scoped-slots.js
@@ -1,6 +1,5 @@
 /* @flow */
 
-import { hasOwn } from 'shared/util'
 import { def } from 'core/util/lang'
 import { normalizeChildren } from 'core/vdom/helpers/normalize-children'
 
@@ -17,7 +16,7 @@ export function normalizeScopedSlots (
     res = {}
     for (const key in slots) {
       if (slots[key] && key[0] !== '$') {
-        res[key] = normalizeScopedSlot(normalSlots, key, slots[key])
+        res[key] = normalizeScopedSlot(slots[key])
       }
     }
   }
@@ -32,20 +31,13 @@ export function normalizeScopedSlots (
   return res
 }
 
-function normalizeScopedSlot(normalSlots, key, fn) {
-  const normalized = (scope = {}) => {
+function normalizeScopedSlot(fn: Function): Function {
+  return scope => {
     const res = fn(scope)
     return res && typeof res === 'object' && !Array.isArray(res)
       ? [res] // single vnode
       : normalizeChildren(res)
   }
-  // proxy scoped slots on normal $slots
-  if (!hasOwn(normalSlots, key)) {
-    Object.defineProperty(normalSlots, key, {
-      get: normalized
-    })
-  }
-  return normalized
 }
 
 function proxyNormalSlot(slots, key) {

diff --git a/test/unit/features/component/component-scoped-slot.spec.js b/test/unit/features/component/component-scoped-slot.spec.js
@@ -456,7 +456,7 @@ describe('Component scoped slot', () => {
   })
 
   // new in 2.6, unifying all slots as functions
-  it('non-scoped slots should also be available on this.$scopedSlots', () => {
+  it('non-scoped slots should also be available on $scopedSlots', () => {
     const vm = new Vue({
       template: `<foo>before <div slot="bar" slot-scope="scope">{{ scope.msg }}</div> after</foo>`,
       components: {
@@ -473,24 +473,6 @@ describe('Component scoped slot', () => {
     expect(vm.$el.innerHTML).toBe(`before  after<div>hi</div>`)
   })
 
-  // #9421 the other side of unification is also needed
-  // for library authors
-  it('scoped slots should also be available on this.$slots', () => {
-    const Child = {
-      render: function (h) {
-        return h(
-          'div',
-          this.$slots.content
-        )
-      }
-    }
-    const vm = new Vue({
-      template: `<child><template #content>foo</template></child>`,
-      components: { Child }
-    }).$mount()
-    expect(vm.$el.innerHTML).toBe(`foo`)
-  })
-
   // #4779
   it('should support dynamic slot target', done => {
     const Child = {