Revert "DevTools: Improve browser extension iframe support (#19854)" (#19959)

Brian Vaughn · web-flow · commit 461cd84944c2 · 2020-10-05T09:44:08.000-04:00
This reverts commit a99bf5c.
diff --git a/fixtures/devtools/iframe/iframe-in-component.html b/fixtures/devtools/iframe/iframe-in-component.html
diff --git a/fixtures/devtools/iframe/iframe-other-origin.html b/fixtures/devtools/iframe/iframe-other-origin.html
diff --git a/fixtures/devtools/iframe/iframe-same-origin-sandbox.html b/fixtures/devtools/iframe/iframe-same-origin-sandbox.html
diff --git a/fixtures/devtools/iframe/iframe-same-origin.html b/fixtures/devtools/iframe/iframe-same-origin.html
diff --git a/fixtures/devtools/iframe/index.html b/fixtures/devtools/iframe/index.html
diff --git a/fixtures/devtools/iframe/main.html b/fixtures/devtools/iframe/main.html
diff --git a/fixtures/devtools/iframe/server.js b/fixtures/devtools/iframe/server.js
diff --git a/fixtures/devtools/regression/14.9.html b/fixtures/devtools/regression/14.9.html
@@ -5,6 +5,12 @@
     <title>React 14.9</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@0.14.9/dist/react.js"></script>
     <script src="https://unpkg.com/react-dom@0.14.9/dist/react-dom.js"></script>
     
diff --git a/fixtures/devtools/regression/15.0.html b/fixtures/devtools/regression/15.0.html
@@ -5,6 +5,11 @@
     <title>React 15.0</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
 
     <script src="https://unpkg.com/react@15.0/dist/react.js"></script>
     <script src="https://unpkg.com/react-dom@15.0/dist/react-dom.js"></script>
diff --git a/fixtures/devtools/regression/15.1.html b/fixtures/devtools/regression/15.1.html
@@ -5,6 +5,12 @@
     <title>React 15.1</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@15.1/dist/react.js"></script>
     <script src="https://unpkg.com/react-dom@15.1/dist/react-dom.js"></script>
     
diff --git a/fixtures/devtools/regression/15.2.html b/fixtures/devtools/regression/15.2.html
@@ -5,6 +5,12 @@
     <title>React 15.2</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@15.2/dist/react.js"></script>
     <script src="https://unpkg.com/react-dom@15.2/dist/react-dom.js"></script>
     
diff --git a/fixtures/devtools/regression/15.3.html b/fixtures/devtools/regression/15.3.html
@@ -5,6 +5,12 @@
     <title>React 15.3</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@15.3/dist/react.js"></script>
     <script src="https://unpkg.com/react-dom@15.3/dist/react-dom.js"></script>
     
diff --git a/fixtures/devtools/regression/15.4.html b/fixtures/devtools/regression/15.4.html
@@ -5,6 +5,12 @@
     <title>React 15.4</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@15.4/dist/react.js"></script>
     <script src="https://unpkg.com/react-dom@15.4/dist/react-dom.js"></script>
     
diff --git a/fixtures/devtools/regression/15.5.html b/fixtures/devtools/regression/15.5.html
@@ -5,6 +5,12 @@
     <title>React 15.5</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@15.5/dist/react.js"></script>
     <script src="https://unpkg.com/react-dom@15.5/dist/react-dom.js"></script>
     
diff --git a/fixtures/devtools/regression/15.6.html b/fixtures/devtools/regression/15.6.html
@@ -5,6 +5,12 @@
     <title>React 15.6</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@15.6/dist/react.js"></script>
     <script src="https://unpkg.com/react-dom@15.6/dist/react-dom.js"></script>
     
diff --git a/fixtures/devtools/regression/16.0.html b/fixtures/devtools/regression/16.0.html
@@ -5,6 +5,12 @@
     <title>React 16.0</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@16.0/umd/react.development.js"></script>
     <script src="https://unpkg.com/react-dom@16.0/umd/react-dom.development.js"></script>
     
diff --git a/fixtures/devtools/regression/16.1.html b/fixtures/devtools/regression/16.1.html
@@ -5,6 +5,12 @@
     <title>React 16.1</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@16.1/umd/react.development.js"></script>
     <script src="https://unpkg.com/react-dom@16.1/umd/react-dom.development.js"></script>
     
diff --git a/fixtures/devtools/regression/16.2.html b/fixtures/devtools/regression/16.2.html
@@ -5,6 +5,12 @@
     <title>React 16.2</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@16.2/umd/react.development.js"></script>
     <script src="https://unpkg.com/react-dom@16.2/umd/react-dom.development.js"></script>
     
diff --git a/fixtures/devtools/regression/16.3.html b/fixtures/devtools/regression/16.3.html
@@ -5,6 +5,12 @@
     <title>React 16.3</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@16.3/umd/react.development.js"></script>
     <script src="https://unpkg.com/react-dom@16.3/umd/react-dom.development.js"></script>
     
diff --git a/fixtures/devtools/regression/16.4.html b/fixtures/devtools/regression/16.4.html
@@ -5,6 +5,12 @@
     <title>React 16.4</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/react@16.4/umd/react.development.js"></script>
     <script src="https://unpkg.com/react-dom@16.4/umd/react-dom.development.js"></script>
     
diff --git a/fixtures/devtools/regression/16.5.html b/fixtures/devtools/regression/16.5.html
@@ -5,6 +5,12 @@
     <title>React 16.5</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/schedule@0.5.0/umd/schedule.development.js"></script>
     <script src="https://unpkg.com/schedule@0.5.0/umd/schedule-tracing.development.js"></script>
     <script src="https://unpkg.com/react@16.5/umd/react.development.js"></script>
diff --git a/fixtures/devtools/regression/16.6.html b/fixtures/devtools/regression/16.6.html
@@ -5,6 +5,12 @@
     <title>React 16.6</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/scheduler@0.10.0/umd/scheduler.development.js"></script>
     <script src="https://unpkg.com/scheduler@0.10.0/umd/scheduler-tracing.development.js"></script>
     <script src="https://unpkg.com/react@16.6/umd/react.development.js"></script>
diff --git a/fixtures/devtools/regression/16.7.html b/fixtures/devtools/regression/16.7.html
@@ -5,6 +5,12 @@
     <title>React 16.7</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/scheduler@0.12.0/umd/scheduler.development.js"></script>
     <script src="https://unpkg.com/scheduler@0.12.0/umd/scheduler-tracing.development.js"></script>
     <script src="https://unpkg.com/react@16.7/umd/react.development.js"></script>
diff --git a/fixtures/devtools/regression/canary.html b/fixtures/devtools/regression/canary.html
@@ -5,6 +5,12 @@
     <title>React canary</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/scheduler@canary/umd/scheduler.development.js"></script>
     <script src="https://unpkg.com/scheduler@canary/umd/scheduler-tracing.development.js"></script>
     <script src="https://unpkg.com/react@canary/umd/react.development.js"></script>
diff --git a/fixtures/devtools/regression/next.html b/fixtures/devtools/regression/next.html
@@ -5,6 +5,12 @@
     <title>React next</title>
     <link rel="stylesheet" href="styles.css" />
 
+    <script type="text/javascript">
+      // Enable DevTools to inspect React inside of an <iframe>
+      // This must run before React is loaded
+      __REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+    </script>
+
     <script src="https://unpkg.com/scheduler@next/umd/scheduler.development.js"></script>
     <script src="https://unpkg.com/scheduler@next/umd/scheduler-tracing.development.js"></script>
     <script src="https://unpkg.com/react@next/umd/react.development.js"></script>
diff --git a/packages/react-devtools-extensions/README.md b/packages/react-devtools-extensions/README.md
@@ -34,7 +34,4 @@ yarn run test:chrome # Test Chrome extension
 
 yarn build:firefox # => packages/react-devtools-extensions/firefox/build
 yarn run test:firefox # Test Firefox extension
-
-yarn build:edge # => packages/react-devtools-extensions/edge/build
-yarn run test:edge # Test Edge extension
 ```
diff --git a/packages/react-devtools-extensions/chrome/manifest.json b/packages/react-devtools-extensions/chrome/manifest.json
@@ -53,8 +53,7 @@
     {
       "matches": ["<all_urls>"],
       "js": ["build/injectGlobalHook.js"],
-      "run_at": "document_start",
-      "all_frames": true
+      "run_at": "document_start"
     }
   ]
 }
diff --git a/packages/react-devtools-extensions/edge/manifest.json b/packages/react-devtools-extensions/edge/manifest.json
@@ -53,8 +53,7 @@
     {
       "matches": ["<all_urls>"],
       "js": ["build/injectGlobalHook.js"],
-      "run_at": "document_start",
-      "all_frames": true
+      "run_at": "document_start"
     }
   ]
 }
diff --git a/packages/react-devtools-extensions/firefox/manifest.json b/packages/react-devtools-extensions/firefox/manifest.json
@@ -57,8 +57,7 @@
     {
       "matches": ["<all_urls>"],
       "js": ["build/injectGlobalHook.js"],
-      "run_at": "document_start",
-      "all_frames": true
+      "run_at": "document_start"
     }
   ]
 }
diff --git a/packages/react-devtools-shared/src/hook.js b/packages/react-devtools-shared/src/hook.js
