ssr: inject userContext into vnode to ensure correctness

yyx990803 · yyx990803 · commit 9ca0c35a3fad · 2017-04-20T13:05:59.000+08:00
diff --git a/src/core/instance/render.js b/src/core/instance/render.js
@@ -27,10 +27,9 @@ import { renderStatic, markOnce } from './render-helpers/render-static'
 import { resolveSlots, resolveScopedSlots } from './render-helpers/resolve-slots'
 
 export function initRender (vm: Component) {
-  vm.$vnode = null // the placeholder node in parent tree
   vm._vnode = null // the root of the child tree
   vm._staticTrees = null
-  const parentVnode = vm.$options._parentVnode
+  const parentVnode = vm.$vnode = vm.$options._parentVnode // the placeholder node in parent tree
   const renderContext = parentVnode && parentVnode.context
   vm.$slots = resolveSlots(vm.$options._renderChildren, renderContext)
   vm.$scopedSlots = emptyObject
diff --git a/src/server/bundle-renderer/create-bundle-runner.js b/src/server/bundle-renderer/create-bundle-runner.js
@@ -104,6 +104,7 @@ export function createBundleRunner (entry, files, basedir, runInNewContext) {
     // slightly differently.
     const initialContext = {}
     const sharedContext = createContext(initialContext)
+    delete sharedContext.__VUE_SSR_CONTEXT__
     let runner // lazy creation so that errors can be caught by user
     return (userContext = {}) => new Promise(resolve => {
       if (!runner) {
@@ -115,7 +116,6 @@ export function createBundleRunner (entry, files, basedir, runInNewContext) {
           )
         }
       }
-      sharedContext.__VUE_SSR_CONTEXT__ = userContext
       userContext._registeredComponents = new Set()
       // vue-style-loader styles imported outside of component lifecycle hooks
       if (initialContext._styles) {
diff --git a/src/server/render.js b/src/server/render.js
@@ -141,10 +141,13 @@ function renderComponentWithCache (node, isRoot, key, context) {
 
 function renderComponentInner (node, isRoot, context) {
   const prevActive = context.activeInstance
+  // expose userContext on vnode
+  node.ssrContext = context.userContext
   const child = context.activeInstance = createComponentInstanceForVnode(
     node,
     context.activeInstance
   )
+  node.ssrContext = null
   normalizeRender(child)
   const childNode = child._render()
   childNode.parent = node
diff --git a/test/ssr/fixtures/async-bar.js b/test/ssr/fixtures/async-bar.js
@@ -1,8 +1,6 @@
-/* globals __VUE_SSR_CONTEXT__ */
-
 module.exports = {
   beforeCreate () {
-    __VUE_SSR_CONTEXT__._registeredComponents.add('__MODULE_ID__')
+    this.$vnode.ssrContext._registeredComponents.add('__MODULE_ID__')
   },
   render (h) {
     return h('div', 'async bar')
diff --git a/test/ssr/fixtures/async-foo.js b/test/ssr/fixtures/async-foo.js
@@ -1,12 +1,10 @@
-/* globals __VUE_SSR_CONTEXT__ */
-
 // import image and font
 import font from './test.woff2'
 import image from './test.png'
 
 module.exports = {
   beforeCreate () {
-    __VUE_SSR_CONTEXT__._registeredComponents.add('__MODULE_ID__')
+    this.$vnode.ssrContext._registeredComponents.add('__MODULE_ID__')
   },
   render (h) {
     return h('div', `async ${font} ${image}`)
diff --git a/test/ssr/fixtures/nested-cache.js b/test/ssr/fixtures/nested-cache.js
@@ -1,56 +1,46 @@
-/* globals __VUE_SSR_CONTEXT__ */
-
 import Vue from '../../../dist/vue.runtime.common.js'
 
-function register (id, context) {
-  context = context || __VUE_SSR_CONTEXT__
-  context.registered.push(id)
+function createRegisterFn (id) {
+  return function (context) {
+    context = context || this.$vnode.ssrContext
+    context.registered.push(id)
+  }
+}
+
+function addHooks (comp) {
+  const hook = createRegisterFn(comp.name)
+  return Object.assign(comp, {
+    _ssrRegister: hook,
+    beforeCreate: hook
+  })
 }
 
-const grandchild = {
+const grandchild = addHooks({
   name: 'grandchild',
   props: ['id'],
-  _ssrRegister: context => {
-    register('grandchild', context)
-  },
-  beforeCreate () {
-    register('grandchild')
-  },
   serverCacheKey: props => props.id,
   render (h) {
     return h('div', '/test')
   }
-}
+})
 
-const child = {
+const child = addHooks({
   name: 'child',
   props: ['id'],
-  _ssrRegister: context => {
-    register('child', context)
-  },
-  beforeCreate () {
-    register('child')
-  },
   serverCacheKey: props => props.id,
   render (h) {
     return h(grandchild, { props: { id: this.id }})
   }
-}
+})
 
-const app = {
+const app = addHooks({
   name: 'app',
   props: ['id'],
-  _ssrRegister: context => {
-    register('app', context)
-  },
-  beforeCreate () {
-    register('app')
-  },
   serverCacheKey: props => props.id,
   render (h) {
     return h(child, { props: { id: this.id }})
   }
-}
+})
 
 export default () => {
   return Promise.resolve(new Vue({

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ export function createBundleRunner (entry, files, basedir, runInNewContext) {`
`104`	`104`	`// slightly differently.`
`105`	`105`	`const initialContext = {}`
`106`	`106`	`const sharedContext = createContext(initialContext)`
	`107`	`+ delete sharedContext.__VUE_SSR_CONTEXT__`
`107`	`108`	`let runner // lazy creation so that errors can be caught by user`
`108`	`109`	`return (userContext = {}) => new Promise(resolve => {`
`109`	`110`	`if (!runner) {`
`@@ -115,7 +116,6 @@ export function createBundleRunner (entry, files, basedir, runInNewContext) {`
`115`	`116`	`)`
`116`	`117`	`}`
`117`	`118`	`}`
`118`		`- sharedContext.__VUE_SSR_CONTEXT__ = userContext`
`119`	`119`	`userContext._registeredComponents = new Set()`
`120`	`120`	`// vue-style-loader styles imported outside of component lifecycle hooks`
`121`	`121`	`if (initialContext._styles) {`