fix: improve slots option

packages/create-instance/create-functional-component.js

@@ -2,11 +2,12 @@
 
 import { throwError } from 'shared/util'
 import { validateSlots } from './validate-slots'
-import { createSlotVNodes } from './add-slots'
+import { createSlotVNodes } from './create-slot-vnodes'
 
 export default function createFunctionalComponent (
   component: Component,
-  mountingOptions: Options
+  mountingOptions: Options,
+  _Vue: Component
 ): Component {
   if (mountingOptions.context && typeof mountingOptions.context !== 'object') {
     throwError('mount.context must be an object')
@@ -25,7 +26,7 @@ export default function createFunctionalComponent (
           mountingOptions.context.children.map(
             x => (typeof x === 'function' ? x(h) : x)
           )) ||
-          createSlotVNodes(h, mountingOptions.slots || {})
+          createSlotVNodes(h, mountingOptions.slots || {}, _Vue)
       )
     },
     name: component.name,

packages/create-instance/create-instance.js

@@ -1,6 +1,6 @@
 // @flow
 
-import { createSlotVNodes } from './add-slots'
+import { createSlotVNodes } from './create-slot-vnodes'
 import addMocks from './add-mocks'
 import { addEventLogger } from './log-events'
 import { createComponentStubs } from 'shared/stub-components'
@@ -40,7 +40,7 @@ export default function createInstance (
     (component.options && component.options.functional) ||
     component.functional
   ) {
-    component = createFunctionalComponent(component, options)
+    component = createFunctionalComponent(component, options, _Vue)
   } else if (options.context) {
     throwError(
       `mount.context can only be used when mounting a ` + `functional component`
@@ -129,7 +129,7 @@ export default function createInstance (
     provide: options.provide,
     render (h) {
       const slots = options.slots
-        ? createSlotVNodes(h, options.slots)
+        ? createSlotVNodes(h, options.slots, _Vue)
         : undefined
       return h(
         Constructor,

packages/create-instance/add-slots.js → packages/create-instance/create-slot-vnodes.js

@@ -1,5 +1,6 @@
 // @flow
 
+import Vue from 'vue'
 import { compileToFunctions } from 'vue-template-compiler'
 
 function startsWithTag (str: SlotValue): boolean {
@@ -9,7 +10,8 @@ function startsWithTag (str: SlotValue): boolean {
 function createVNodesForSlot (
   h: Function,
   slotValue: SlotValue,
-  name: string
+  name: string,
+  _Vue: any
 ): VNode | string {
   if (typeof slotValue === 'string' && !startsWithTag(slotValue)) {
     return slotValue
@@ -18,22 +20,41 @@ function createVNodesForSlot (
   const el =
     typeof slotValue === 'string' ? compileToFunctions(slotValue) : slotValue
 
-  const vnode = h(el)
+  let vnode = h(el)
+  if (typeof slotValue === 'string') {
+    const vue = new Vue()
+    const _vue = new _Vue()
+    for (const key in _vue._renderProxy) {
+      if (!(vue._renderProxy[key])) {
+        vue._renderProxy[key] = _vue._renderProxy[key]
+      }
+    }
+    try {
+      // $FlowIgnore
+      vnode = el.render.call(vue._renderProxy, h)
+      vnode = h(vnode.tag, vnode.data || {}, vnode.children)
+    } catch (e) {
+    }
+  }
+
   vnode.data.slot = name
   return vnode
 }
 
 export function createSlotVNodes (
   h: Function,
-  slots: SlotsObject
+  slots: SlotsObject,
+  _Vue: any
 ): Array<VNode | string> {
   return Object.keys(slots).reduce((acc, key) => {
     const content = slots[key]
     if (Array.isArray(content)) {
-      const nodes = content.map(slotDef => createVNodesForSlot(h, slotDef, key))
+      const nodes = content.map(
+        slotDef => createVNodesForSlot(h, slotDef, key, _Vue)
+      )
       return acc.concat(nodes)
     }
 
-    return acc.concat(createVNodesForSlot(h, content, key))
+    return acc.concat(createVNodesForSlot(h, content, key, _Vue))
   }, [])
 }

test/resources/components/component-with-parent-name.vue

@@ -0,0 +1,18 @@
+<template>
+  <div><span baz="qux">{{ fromLocalVue }},{{ bar }}</span></div>
+</template>
+
+<script>
+  export default{
+    name: 'component-with-parent-name',
+    props: ['fromLocalVue'],
+    data () {
+      return {
+        bar: 'quux'
+      }
+    },
+    mounted () {
+      this.$parent.childComponentName = this.$options.name
+    }
+  }
+</script>

test/specs/mounting-options/slots.spec.js

@@ -2,8 +2,10 @@ import { compileToFunctions } from 'vue-template-compiler'
 import Component from '~resources/components/component.vue'
 import ComponentWithSlots from '~resources/components/component-with-slots.vue'
 import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
+import ComponentWithParentName from '~resources/components/component-with-parent-name.vue'
 import { describeWithMountingMethods, vueVersion } from '~resources/utils'
 import { itSkipIf, itDoNotRunIf } from 'conditional-specs'
+import { mount, createLocalVue } from '~vue/test-utils'
 
 describeWithMountingMethods('options.slots', mountingMethod => {
   it('mounts component with default slot if passed component in slot object', () => {
@@ -568,4 +570,41 @@ describeWithMountingMethods('options.slots', mountingMethod => {
       expect(wrapper.contains(ComponentAsAClass)).to.equal(true)
     }
   })
+
+  itDoNotRunIf(
+    mountingMethod.name === 'renderToString',
+    'sets a component which can access the parent component and the child component',
+    () => {
+      const localVue = createLocalVue()
+      localVue.prototype.bar = 'FOO'
+      const ParentComponent = mount(
+        {
+          name: 'parentComponent',
+          template: '<div><slot /></div>',
+          data () {
+            return {
+              childComponentName: ''
+            }
+          }
+        },
+        {
+          components: {
+            ComponentWithParentName
+          },
+          slots: {
+            default: [
+              '<component-with-parent-name :fromLocalVue="bar" />',
+              '<component-with-parent-name :fromLocalVue="bar" />'
+            ]
+          },
+          localVue
+        }
+      )
+      const childComponentName = 'component-with-parent-name'
+      expect(ParentComponent.vm.childComponentName).to.equal(childComponentName)
+      expect(ParentComponent.vm.$children.length).to.equal(2)
+      expect(ParentComponent.vm.$children.every(c => c.$options.name === childComponentName)).to.equal(true)
+      expect(ParentComponent.html()).to.equal('<div><div><span baz="qux">FOO,quux</span></div><div><span baz="qux">FOO,quux</span></div></div>')
+    }
+  )
 })