Merge f8960fb into 95aa28f

preactjs · Jul 13, 2019 · 91c5af6 · 91c5af6
2 parents 95aa28f + f8960fb
commit 91c5af6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/debug/src/debug.js b/debug/src/debug.js
@@ -198,9 +198,11 @@ export function initDebug() {
 	};
 
 	options.diffed = (vnode) => {
+		if (oldDiffed) oldDiffed(vnode);
+
 		if (vnode._component && vnode._component.__hooks) {
 			let hooks = vnode._component.__hooks;
-			hooks._list.forEach(hook => {
+			(hooks._list || []).forEach(hook => {
 				if (hook._callback && (!hook._args || !Array.isArray(hook._args))) {
 					/* istanbul ignore next */
 					console.warn(
@@ -209,7 +211,7 @@ export function initDebug() {
 					);
 				}
 			});
-			if (hooks._pendingEffects.length > 0) {
+			if (hooks._pendingEffects && Array.isArray(hooks._pendingEffects)) {
 				hooks._pendingEffects.forEach((effect) => {
 					if ((!effect._args || !Array.isArray(effect._args)) && !warnedComponents.useEffect[vnode.type]) {
 						warnedComponents.useEffect[vnode.type] = true;
@@ -220,7 +222,7 @@ export function initDebug() {
 					}
 				});
 			}
-			if (hooks._pendingLayoutEffects.length > 0) {
+			if (hooks._pendingLayoutEffects && Array.isArray(hooks._pendingLayoutEffects)) {
 				hooks._pendingLayoutEffects.forEach((layoutEffect) => {
 					if ((!layoutEffect._args || !Array.isArray(layoutEffect._args)) && !warnedComponents.useLayoutEffect[vnode.type]) {
 						warnedComponents.useLayoutEffect[vnode.type] = true;
@@ -255,8 +257,6 @@ export function initDebug() {
 				keys.push(key);
 			}
 		}
-
-		if (oldDiffed) oldDiffed(vnode);
 	};
 }