From d7557db4f12c5b5f0d19a56af49b3298059eeb51 Mon Sep 17 00:00:00 2001
From: eddyerburgh <edward.yerburgh@gmail.com>
Date: Sun, 23 Sep 2018 20:16:50 +0100
Subject: [PATCH 1/2] fix: render all slots inside a <template> vnode

---
 .../create-instance/create-slot-vnodes.js     | 25 +++++++------------
 test/specs/mounting-options/slots.spec.js     |  8 +++---
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/packages/create-instance/create-slot-vnodes.js b/packages/create-instance/create-slot-vnodes.js
index dfa8edd44..b9e42e8a1 100644
--- a/packages/create-instance/create-slot-vnodes.js
+++ b/packages/create-instance/create-slot-vnodes.js
@@ -4,9 +4,12 @@ import { compileToFunctions } from 'vue-template-compiler'
 
 function createVNodes (
   vm: Component,
-  slotValue: string
+  slotValue: string,
+  name
 ): Array<VNode> {
-  const el = compileToFunctions(`<div>${slotValue}</div>`)
+  const el = compileToFunctions(
+    `<div><template slot=${name}>${slotValue}</template></div>`
+  )
   const _staticRenderFns = vm._renderProxy.$options.staticRenderFns
   const _staticTrees = vm._renderProxy._staticTrees
   vm._renderProxy._staticTrees = []
@@ -14,7 +17,7 @@ function createVNodes (
   const vnode = el.render.call(vm._renderProxy, vm.$createElement)
   vm._renderProxy.$options.staticRenderFns = _staticRenderFns
   vm._renderProxy._staticTrees = _staticTrees
-  return vnode.children
+  return vnode.children[0]
 }
 
 function createVNodesForSlot (
@@ -22,21 +25,11 @@ function createVNodesForSlot (
   slotValue: SlotValue,
   name: string,
 ): VNode | Array<VNode> {
-  let vnode
   if (typeof slotValue === 'string') {
-    const vnodes = createVNodes(vm, slotValue)
-    if (vnodes.length > 1) {
-      return vnodes
-    }
-    vnode = vnodes[0]
-  } else {
-    vnode = vm.$createElement(slotValue)
-  }
-  if (vnode.data) {
-    vnode.data.slot = name
-  } else {
-    vnode.data = { slot: name }
+    return createVNodes(vm, slotValue, name)
   }
+  const vnode = vm.$createElement(slotValue)
+  ;(vnode.data || (vnode.data = {})).slot = name
   return vnode
 }
 
diff --git a/test/specs/mounting-options/slots.spec.js b/test/specs/mounting-options/slots.spec.js
index 38d484532..55d82443e 100644
--- a/test/specs/mounting-options/slots.spec.js
+++ b/test/specs/mounting-options/slots.spec.js
@@ -237,14 +237,14 @@ describeWithMountingMethods('options.slots', mountingMethod => {
   it('mounts component with default and named text slot', () => {
     const wrapper = mountingMethod(ComponentWithSlots, {
       slots: {
-        default: 'hello,',
-        footer: '<template>world</template>'
+        footer: 'world',
+        default: 'hello,'
       }
     })
     if (mountingMethod.name === 'renderToString') {
-      expect(wrapper).contains('hello,world')
+      expect(wrapper).contains('hello, world')
     } else {
-      expect(wrapper.text()).to.contain('hello,world')
+      expect(wrapper.text()).to.contain('hello, world')
     }
   })
 

From 76028f3da8a79c17f9eb9cd5f5871890a4bb716d Mon Sep 17 00:00:00 2001
From: eddyerburgh <edward.yerburgh@gmail.com>
Date: Sun, 23 Sep 2018 20:58:08 +0100
Subject: [PATCH 2/2] test: fix node test

---
 test/specs/mounting-options/slots.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/specs/mounting-options/slots.spec.js b/test/specs/mounting-options/slots.spec.js
index 55d82443e..5d70a404d 100644
--- a/test/specs/mounting-options/slots.spec.js
+++ b/test/specs/mounting-options/slots.spec.js
@@ -242,7 +242,7 @@ describeWithMountingMethods('options.slots', mountingMethod => {
       }
     })
     if (mountingMethod.name === 'renderToString') {
-      expect(wrapper).contains('hello, world')
+      expect(wrapper).contains('hello,</main> <footer>world')
     } else {
       expect(wrapper.text()).to.contain('hello, world')
     }