From a150609f82721c0dcab602abc3fa5a14f40ce577 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Thu, 11 May 2017 14:50:24 -0400
Subject: [PATCH] Display only createElement warnings

---
 packages/react-error-overlay/src/overlay.js   | 29 ++++++-------
 .../react-error-overlay/src/utils/warnings.js | 43 +++++++++++++++++++
 2 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 packages/react-error-overlay/src/utils/warnings.js

diff --git a/packages/react-error-overlay/src/overlay.js b/packages/react-error-overlay/src/overlay.js
index d65b1313bd2..4c1d1f48144 100644
--- a/packages/react-error-overlay/src/overlay.js
+++ b/packages/react-error-overlay/src/overlay.js
@@ -22,6 +22,7 @@ import {
 import {
   permanentRegister as permanentRegisterConsole,
 } from './effects/proxyConsole';
+import { massage as massageWarning } from './utils/warnings';
 
 import {
   consume as consumeError,
@@ -210,23 +211,17 @@ function inject() {
   registerStackTraceLimit();
 
   permanentRegisterConsole('error', warning => {
-    const nIndex = warning.indexOf('\n');
-    let message = warning;
-    if (nIndex !== -1) {
-      message = message.substring(0, nIndex);
-    }
-    const stack = warning.substring(nIndex + 1);
-    window.requestAnimationFrame(function() {
-      return crash(
-        // $FlowFixMe
-        {
-          message: message,
-          stack: stack,
-          __unmap_source: '/static/js/bundle.js',
-        },
-        false
-      );
-    });
+    const data = massageWarning(warning);
+    if (data == null) return;
+    crash(
+      // $FlowFixMe
+      {
+        message: data.message,
+        stack: data.stack,
+        __unmap_source: '/static/js/bundle.js',
+      },
+      false
+    );
   });
 }
 
diff --git a/packages/react-error-overlay/src/utils/warnings.js b/packages/react-error-overlay/src/utils/warnings.js
new file mode 100644
index 00000000000..d64b3d34dd4
--- /dev/null
+++ b/packages/react-error-overlay/src/utils/warnings.js
@@ -0,0 +1,43 @@
+// @flow
+
+// This is a list of React warnings to display
+// There must be zero or one capture group; and the capture group is assumed to be a missing stack frame.
+const warnings = [
+  /^.*React.createElement: type is invalid.+Check your code at (.*?:.*)[.]$/,
+];
+// This is a list of information to remove from React warnings, it's not particularly useful to show
+const removals = [/Check your code at (.*?:.*)[.]/];
+
+function massage(warning: string): { message: string, stack: string } | null {
+  const nIndex = warning.indexOf('\n');
+  let message = warning;
+  if (nIndex !== -1) {
+    message = message.substring(0, nIndex);
+  }
+  let stack = warning.substring(nIndex + 1);
+
+  let found = false;
+  for (const warning of warnings) {
+    const m = message.match(warning);
+    if (!m) {
+      continue;
+    }
+    found = true;
+    if (!m[1]) {
+      break;
+    }
+    stack = `in render (at ${m[1]})\n${stack}`;
+    break;
+  }
+  if (!found) {
+    return null;
+  }
+
+  for (const trim of removals) {
+    message = message.replace(trim, '');
+  }
+
+  return { message, stack };
+}
+
+export { massage };