fix(ssr): reference error when create $ssrContext for root component (#…

…5981) fix #5941
vuejs · Jun 29, 2017 · 5581654 · 5581654
1 parent 0cd6ef3
commit 5581654
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/core/index.js b/src/core/index.js
@@ -11,7 +11,7 @@ Object.defineProperty(Vue.prototype, '$isServer', {
 Object.defineProperty(Vue.prototype, '$ssrContext', {
   get () {
     /* istanbul ignore next */
-    return this.$vnode.ssrContext
+    return this.$vnode && this.$vnode.ssrContext
   }
 })
 

diff --git a/test/ssr/ssr-basic-renderer.spec.js b/test/ssr/ssr-basic-renderer.spec.js
@@ -50,4 +50,21 @@ describe('SSR: basicRenderer', () => {
       done()
     })
   })
+
+  // #5941
+  it('should work peoperly when accessing $ssrContext in root component', done => {
+    let ssrContext
+    renderToString(new Vue({
+      template: `
+        <div></div>
+      `,
+      created () {
+        ssrContext = this.$ssrContext
+      }
+    }), (err, result) => {
+      expect(err).toBeNull()
+      expect(ssrContext).toBeUndefined()
+      done()
+    })
+  })
 })