From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Oct 2018 16:41:18 +0000 (-0400)
Subject: refactor: tweak arguments
X-Git-Tag: v3.0.0-alpha.0~1113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0f3a67e2946566c4eb3d5f5028728b79df26fcd;p=thirdparty%2Fvuejs%2Fcore.git

refactor: tweak arguments
---

diff --git a/packages/core/src/componentUtils.ts b/packages/core/src/componentUtils.ts
index 04a8808b5d..bb91a6b197 100644
--- a/packages/core/src/componentUtils.ts
+++ b/packages/core/src/componentUtils.ts
@@ -23,12 +23,11 @@ import { handleError, ErrorTypes } from './errorHandling'
 import { warn } from './warning'
 
 let currentVNode: VNode | null = null
-let currentContextVNode: MountedVNode | null = null
+let currentContextVNode: VNode | null = null
 
 export function createComponentInstance(
   vnode: VNode,
-  Component: ComponentClass,
-  contextVNode: MountedVNode | null
+  Component: ComponentClass
 ): ComponentInstance {
   // component instance creation is done in two steps.
   // first, `initializeComponentInstance` is called inside base component
@@ -38,7 +37,7 @@ export function createComponentInstance(
   // we are storing the vnodes in variables here so that there's no need to
   // always pass args in super()
   currentVNode = vnode
-  currentContextVNode = contextVNode
+  currentContextVNode = vnode.contextVNode
   const instance = (vnode.children = new Component() as ComponentInstance)
   // then we finish the initialization by collecting properties set on the
   // instance
diff --git a/packages/core/src/createRenderer.ts b/packages/core/src/createRenderer.ts
index 1362402334..357c9b87dc 100644
--- a/packages/core/src/createRenderer.ts
+++ b/packages/core/src/createRenderer.ts
@@ -210,9 +210,9 @@ export function createRenderer(options: RendererOptions) {
     }
     const { flags } = vnode
     if (flags & VNodeFlags.COMPONENT_STATEFUL) {
-      mountStatefulComponent(vnode, container, contextVNode, isSVG, endNode)
+      mountStatefulComponent(vnode, container, isSVG, endNode)
     } else {
-      mountFunctionalComponent(vnode, container, contextVNode, isSVG, endNode)
+      mountFunctionalComponent(vnode, container, isSVG, endNode)
     }
     if (__DEV__) {
       popContext()
@@ -222,7 +222,6 @@ export function createRenderer(options: RendererOptions) {
   function mountStatefulComponent(
     vnode: VNode,
     container: RenderNode | null,
-    contextVNode: MountedVNode | null,
     isSVG: boolean,
     endNode: RenderNode | null
   ) {
@@ -234,7 +233,6 @@ export function createRenderer(options: RendererOptions) {
         vnode,
         vnode.tag as ComponentClass,
         container,
-        contextVNode,
         isSVG,
         endNode
       )
@@ -244,7 +242,6 @@ export function createRenderer(options: RendererOptions) {
   function mountFunctionalComponent(
     vnode: VNode,
     container: RenderNode | null,
-    contextVNode: MountedVNode | null,
     isSVG: boolean,
     endNode: RenderNode | null
   ) {
@@ -1156,7 +1153,6 @@ export function createRenderer(options: RendererOptions) {
     vnode: VNode,
     Component: ComponentClass,
     container: RenderNode | null,
-    contextVNode: MountedVNode | null,
     isSVG: boolean,
     endNode: RenderNode | null
   ): RenderNode {
@@ -1164,7 +1160,7 @@ export function createRenderer(options: RendererOptions) {
     // new Vue()
     const instance =
       (__COMPAT__ && (vnode.children as ComponentInstance)) ||
-      createComponentInstance(vnode, Component, contextVNode)
+      createComponentInstance(vnode, Component)
 
     // inject platform-specific unmount to keep-alive container
     if ((Component as any)[KeepAliveSymbol] === true) {