Merge branch 'master' into old_css_string

compat/src/index.js

@@ -1,6 +1,7 @@
 import { render as preactRender, cloneElement as preactCloneElement, createRef, h, Component, options, toChildArray, createContext, Fragment } from 'preact';
 import * as hooks from 'preact/hooks';
 export * from 'preact/hooks';
+import { assign } from '../../src/util';
 
 const version = '16.8.0'; // trick libraries to think we are react
 
@@ -292,7 +293,7 @@ function memo(c, comparer) {
 
 	function Memoed(props) {
 		this.shouldComponentUpdate = shouldUpdate;
-		return h(c, { ...props });
+		return h(c, assign({}, props));
 	}
 	Memoed.displayName = 'Memo(' + (c.displayName || c.name) + ')';
 	Memoed._forwarded = true;
@@ -365,8 +366,7 @@ export {
 };
 
 // React copies the named exports to the default one.
-export default {
-	...hooks,
+export default assign({
 	version,
 	Children,
 	render,
@@ -385,4 +385,4 @@ export default {
 	PureComponent,
 	memo,
 	forwardRef
-};
+}, hooks);

src/component.js

@@ -21,6 +21,7 @@ export function Component(props, context) {
 	// Other properties that Component will have set later,
 	// shown here as commented out for quick reference
 	// this.base = null;
+	// this._context = null;
 	// this._ancestorComponent = null; // Always set right after instantiation
 	// this._vnode = null;
 	// this._nextState = null; // Only class components

src/internal.d.ts

@@ -41,6 +41,7 @@ export interface Component<P = {}, S = {}> extends preact.Component<P, S> {
 	state: S; // Override Component["state"] to not be readonly for internal use, specifically Hooks
 	base?: PreactElement;
 
+	_context: any;
 	_dirty: boolean;
 	_renderCallbacks: Array<() => void>;
 	_vnode?: VNode<P> | null;