Merge ff3436d into 1142fff

src/component.js

@@ -165,9 +165,10 @@ let q = [];
 
 /**
  * Asynchronously schedule a callback
- * @type {(cb) => void}
+ * @type {(cb: () => void) => void}
  */
 /* istanbul ignore next */
+// Note the following line isn't tree-shaken by rollup cuz of rollup/rollup#2566
 const defer =
 	typeof Promise == 'function'
 		? Promise.prototype.then.bind(Promise.resolve())
@@ -182,7 +183,7 @@ const defer =
  * * [Callbacks synchronous and asynchronous](https://blog.ometer.com/2011/07/24/callbacks-synchronous-and-asynchronous/)
  */
 
-let prevDebounce = options.debounceRendering;
+let prevDebounce;
 
 /**
  * Enqueue a rerender of a component
@@ -194,7 +195,7 @@ export function enqueueRender(c) {
 		prevDebounce !== options.debounceRendering
 	) {
 		prevDebounce = options.debounceRendering;
-		(options.debounceRendering || defer)(process);
+		(prevDebounce || defer)(process);
 	}
 }
 

src/diff/catch-error.js

@@ -0,0 +1,37 @@
+import { enqueueRender } from '../component';
+
+/**
+ * Find the closest error boundary to a thrown error and call it
+ * @param {object} error The thrown value
+ * @param {import('../internal').VNode} vnode The vnode that threw
+ * the error that was caught (except for unmounting when this parameter
+ * is the highest parent that was being unmounted)
+ */
+export function _catchError(error, vnode) {
+	/** @type {import('../internal').Component} */
+	let component;
+
+	for (; (vnode = vnode._parent); ) {
+		if ((component = vnode._component) && !component._processingException) {
+			try {
+				if (
+					component.constructor &&
+					component.constructor.getDerivedStateFromError != null
+				) {
+					component.setState(
+						component.constructor.getDerivedStateFromError(error)
+					);
+				} else if (component.componentDidCatch != null) {
+					component.componentDidCatch(error);
+				} else {
+					continue;
+				}
+				return enqueueRender((component._pendingError = component));
+			} catch (e) {
+				error = e;
+			}
+		}
+	}
+
+	throw error;
+}

src/diff/index.js

@@ -1,5 +1,5 @@
 import { EMPTY_OBJ, EMPTY_ARR } from '../constants';
-import { Component, enqueueRender } from '../component';
+import { Component } from '../component';
 import { Fragment } from '../create-element';
 import { diffChildren, toChildArray } from './children';
 import { diffProps } from './props';
@@ -441,41 +441,3 @@ export function unmount(vnode, parentVNode, skipRemove) {
 function doRender(props, state, context) {
 	return this.constructor(props, context);
 }
-
-/**
- * Find the closest error boundary to a thrown error and call it
- * @param {object} error The thrown value
- * @param {import('../internal').VNode} vnode The vnode that threw
- * the error that was caught (except for unmounting when this parameter
- * is the highest parent that was being unmounted)
- * @param {import('../internal').VNode} oldVNode The oldVNode of the vnode
- * that threw, if this VNode threw while diffing
- */
-options._catchError = function(error, vnode, oldVNode) {
-	/** @type {import('../internal').Component} */
-	let component;
-
-	for (; (vnode = vnode._parent); ) {
-		if ((component = vnode._component) && !component._processingException) {
-			try {
-				if (
-					component.constructor &&
-					component.constructor.getDerivedStateFromError != null
-				) {
-					component.setState(
-						component.constructor.getDerivedStateFromError(error)
-					);
-				} else if (component.componentDidCatch != null) {
-					component.componentDidCatch(error);
-				} else {
-					continue;
-				}
-				return enqueueRender((component._pendingError = component));
-			} catch (e) {
-				error = e;
-			}
-		}
-	}
-
-	throw error;
-};

src/options.js

@@ -1,4 +1,8 @@
+import { _catchError } from './diff/catch-error';
+
 /** @type {import('./internal').Options}  */
-const options = {};
+const options = {
+	_catchError
+};
 
 export default options;