merge createVNode into createElement

Author: developit

src/component.js

@@ -1,6 +1,6 @@
 import { commitRoot } from './diff/commit';
 import options from './options';
-import { createVNode, Fragment } from './create-element';
+import { createElement, Fragment } from './create-element';
 import { patch } from './diff/patch';
 import { DIRTY_BIT, FORCE_UPDATE, MODE_UNMOUNTING } from './constants';
 import { getParentDom } from './tree';
@@ -93,13 +93,8 @@ Component.prototype.render = Fragment;
  */
 function rerender(internal) {
 	if (~internal.flags & MODE_UNMOUNTING && internal.flags & DIRTY_BIT) {
-		const vnode = createVNode(
-			internal.type,
-			internal.props,
-			internal.key, // @TODO we shouldn't need to actually pass these
-			internal.ref, // since the mode flag should bypass key/ref handling
-			0
-		);
+		const vnode = createElement(internal.type, internal.props);
+		vnode.props = internal.props;
 
 		patch(internal, vnode, getParentDom(internal));
 		commitRoot(internal);

src/create-element.js

@@ -34,31 +34,15 @@ export function createElement(type, props, children) {
 		normalizedProps.children = children;
 	}
 
-	return createVNode(type, normalizedProps, key, ref, 0);
-}
-
-/**
- * Create a VNode (used internally by Preact)
- * @param {import('./internal').VNode["type"]} type The node name or Component
- * Constructor for this virtual node
- * @param {object | string | number | null} props The properties of this virtual node.
- * If this virtual node represents a text node, this is the text of the node (string or number).
- * @param {string | number | null} key The key for this virtual node, used when
- * diffing it against its children
- * @param {import('./internal').VNode["ref"]} ref The ref property that will
- * receive a reference to its created child
- * @returns {import('./internal').VNode}
- */
-export function createVNode(type, props, key, ref, original) {
 	// V8 seems to be better at detecting type shapes if the object is allocated from the same call site
 	// Do not inline into createElement and coerceToVNode!
 	const vnode = {
 		type,
-		props,
+		props: normalizedProps,
 		key,
 		ref,
 		constructor: undefined,
-		_vnodeId: original || ++vnodeId
+		_vnodeId: ++vnodeId
 	};
 
 	if (options.vnode != null) options.vnode(vnode);
@@ -77,7 +61,7 @@ export function normalizeToVNode(childVNode) {
 	}
 	if (type === 'object') {
 		if (Array.isArray(childVNode)) {
-			return createVNode(Fragment, { children: childVNode }, null, null, 0);
+			return createElement(Fragment, null, childVNode);
 		}
 	} else if (type !== 'string' && type !== 'function') {
 		return String(childVNode);