Merge branch 'master' into rollup

facebook · Mar 24, 2017 · 4691521 · 4691521
2 parents 0fd8aa6 + 0a41890
commit 4691521
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/docs/docs/context.md b/docs/docs/context.md
@@ -111,7 +111,7 @@ If `contextTypes` is not defined, then `context` will be an empty object.
 Context can also let you build an API where parents and children communicate. For example, one library that works this way is [React Router V4](https://reacttraining.com/react-router):
 
 ```javascript
-import { Router, Route, Link } from 'react-router-dom';
+import { BrowserRouter as Router, Route, Link } from 'react-router-dom';
 
 const BasicExample = () => (
   <Router>

diff --git a/src/renderers/shared/utils/ReactErrorUtils.js b/src/renderers/shared/utils/ReactErrorUtils.js
@@ -92,12 +92,7 @@ const ReactErrorUtils = {
         typeof injectedErrorUtils.invokeGuardedCallback === 'function',
         'Injected invokeGuardedCallback() must be a function.',
       );
-      invariant(
-        typeof injectedErrorUtils.rethrowCaughtError === 'function',
-        'Injected rethrowCaughtError() must be a function.',
-      );
       invokeGuardedCallback = injectedErrorUtils.invokeGuardedCallback;
-      rethrowCaughtError = injectedErrorUtils.rethrowCaughtError;
     },
   },