remove _context from internal and move to data (#3832)

* remove _context from internal and move to data

* fix render to string

Author: JoviDeCroock

server/src/index.js

@@ -121,9 +121,9 @@ function _renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
 		} else {
 			let rendered;
 
-			vnode._context = context;
 			vnode.data = {
-				_hooks: []
+				_hooks: [],
+				_context: context
 			};
 
 			let c = (vnode._component = {

src/create-root.js

@@ -47,7 +47,7 @@ export function createRoot(parentDom) {
 			}
 			rootInternal.flags |= flags;
 
-			rootInternal._context = {};
+			rootInternal.data._context = {};
 
 			mount(rootInternal, vnode, parentDom, firstChild);
 		}

src/diff/mount.js

@@ -389,7 +389,7 @@ function mountComponent(internal, startDom) {
 	c.state = c._nextState;
 
 	if (c.getChildContext != null) {
-		internal._context = Object.assign({}, context, c.getChildContext());
+		internal.data._context = Object.assign({}, context, c.getChildContext());
 	}
 
 	if (renderResult == null) {

src/diff/patch.js

@@ -292,7 +292,7 @@ function patchComponent(internal, newVNode) {
 	c.state = c._nextState;
 
 	if (c.getChildContext != null) {
-		internal._context = Object.assign({}, context, c.getChildContext());
+		internal.data._context = Object.assign({}, context, c.getChildContext());
 	}
 
 	if (ENABLE_CLASSES) {

src/internal.d.ts

@@ -157,8 +157,6 @@ export interface Internal<P = {}> {
 	 */
 	/** The component instance for which this is a backing Internal node */
 	_component: Component | null;
-	/** most recent context object passed down to this Internal from its parent */
-	_context: any;
 	/** This Internal's distance from the tree root */
 	_depth: number | null;
 	/** Callbacks to invoke when this internal commits */

src/tree.js

@@ -89,15 +89,14 @@ export function createInternal(vnode, parentInternal) {
 		_prevRef: null,
 		data:
 			flags & TYPE_COMPONENT
-				? { _commitCallbacks: [], _stateCallbacks: [] }
+				? { _commitCallbacks: [], _context: null, _stateCallbacks: [] }
 				: null,
 		rerender: enqueueRender,
 		flags,
 		_children: null,
 		_parent: parentInternal,
 		_vnodeId: vnodeId,
 		_component: null,
-		_context: null,
 		_depth: parentInternal ? parentInternal._depth + 1 : 0
 	};
 
@@ -175,7 +174,7 @@ export function getChildDom(internal, offset) {
  */
 export function getParentContext(internal) {
 	// @TODO: compare performance of recursion here (it's 11b smaller, but may be slower for deep trees)
-	return internal._context || getParentContext(internal._parent);
+	return internal.data._context || getParentContext(internal._parent);
 
 	// while ((internal = internal._parent)) {
 	// 	let context = internal._context;