Merge pull request #124 from facebook/remove-require

remove require("React") fixed #59 fixed #107

Author: jaredly

agent/inject.js

@@ -23,7 +23,7 @@ type Agent = {
   on: (evt: string, fn: (...args: Array<any>) => any) => any,
 };
 
-module.exports = function (hook: Hook, agent: Agent, lookForOldReact?: boolean) {
+module.exports = function (hook: Hook, agent: Agent) {
   var subs = [
     hook.sub('renderer-attached', ({id, renderer, helpers}) => {
       agent.setReactInternals(id, helpers);
@@ -35,7 +35,7 @@ module.exports = function (hook: Hook, agent: Agent, lookForOldReact?: boolean)
     hook.sub('unmount', ({renderer, element}) => agent.onUnmounted(element)),
   ];
 
-  var success = setupBackend(hook, lookForOldReact);
+  var success = setupBackend(hook);
   if (!success) {
     return;
   }

backend/backend.js

@@ -27,27 +27,10 @@ import type {Hook} from './types';
 
 var attachRenderer = require('./attachRenderer');
 
-function findOldReact() {
-  if (window.React) {
-    return window.React.__internals;
-  }
-  if (!window.require) {
-    return;
-  }
-  try {
-    return window.require('react').__internals;
-  } catch (e) {}
-  try {
-    return window.require('React').__internals;
-  } catch (e) {}
-}
-
-module.exports = function setupBackend(hook: Hook, lookForOldReact?: boolean): boolean {
-  if (lookForOldReact) {
-    var oldReact = findOldReact();
-    if (oldReact && Object.keys(hook._renderers).length === 0) {
-      hook.inject(oldReact);
-    }
+module.exports = function setupBackend(hook: Hook): boolean {
+  var oldReact = window.React && window.React.__internals;
+  if (oldReact && Object.keys(hook._renderers).length === 0) {
+    hook.inject(oldReact);
   }
 
   for (var rid in hook._renderers) {

shells/chrome/src/backend.js

@@ -64,7 +64,7 @@ function setup(hook) {
   agent.addBridge(bridge);
 
   agent.once('connected', () => {
-    inject(hook, agent, /* lookForOldReact= */!isReactNative);
+    inject(hook, agent);
   });
 
   if (isReactNative) {

shells/firefox/src/backend.js

@@ -63,7 +63,7 @@ function setup() {
   }, 1000);
 
   agent.once('connected', () => {
-    inject(window.__REACT_DEVTOOLS_GLOBAL_HOOK__, agent, /* lookForOldReact= */true);
+    inject(window.__REACT_DEVTOOLS_GLOBAL_HOOK__, agent);
     clearTimeout(_connectTimeout);
   });