diff --git a/fixtures/devtools/iframe/iframe-in-component.html b/fixtures/devtools/iframe/iframe-in-component.html deleted file mode 100644 index 4e123c82e1a61..0000000000000 --- a/fixtures/devtools/iframe/iframe-in-component.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - -
- - - \ No newline at end of file diff --git a/fixtures/devtools/iframe/iframe-other-origin.html b/fixtures/devtools/iframe/iframe-other-origin.html deleted file mode 100644 index cab1851e98639..0000000000000 --- a/fixtures/devtools/iframe/iframe-other-origin.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/fixtures/devtools/iframe/iframe-same-origin-sandbox.html b/fixtures/devtools/iframe/iframe-same-origin-sandbox.html deleted file mode 100644 index 370e5b549d15a..0000000000000 --- a/fixtures/devtools/iframe/iframe-same-origin-sandbox.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/fixtures/devtools/iframe/iframe-same-origin.html b/fixtures/devtools/iframe/iframe-same-origin.html deleted file mode 100644 index 51d0b2ced40a9..0000000000000 --- a/fixtures/devtools/iframe/iframe-same-origin.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/fixtures/devtools/iframe/index.html b/fixtures/devtools/iframe/index.html deleted file mode 100644 index a941775a54f8e..0000000000000 --- a/fixtures/devtools/iframe/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - React DevTools iframe test - - - - - - - - - \ No newline at end of file diff --git a/fixtures/devtools/iframe/main.html b/fixtures/devtools/iframe/main.html deleted file mode 100644 index e2b2a449e9d62..0000000000000 --- a/fixtures/devtools/iframe/main.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - -
- - - \ No newline at end of file diff --git a/fixtures/devtools/iframe/server.js b/fixtures/devtools/iframe/server.js deleted file mode 100755 index 87e5ce0942699..0000000000000 --- a/fixtures/devtools/iframe/server.js +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env node - -const finalhandler = require('finalhandler'); -const http = require('http'); -const serveStatic = require('serve-static'); - -// Serve fixtures folder -const serve = serveStatic(__dirname); - -// Create server -const server = http.createServer(function onRequest(req, res) { - serve(req, res, finalhandler(req, res)); -}); - -console.log('Listening on http://localhost:3000'); - -// Listen -server.listen(3000); diff --git a/fixtures/devtools/regression/14.9.html b/fixtures/devtools/regression/14.9.html index c6d6d36fe6f33..524ff196881f5 100644 --- a/fixtures/devtools/regression/14.9.html +++ b/fixtures/devtools/regression/14.9.html @@ -5,6 +5,12 @@ React 14.9 + + diff --git a/fixtures/devtools/regression/15.0.html b/fixtures/devtools/regression/15.0.html index 37590fdda31c9..fde26012c6bbe 100644 --- a/fixtures/devtools/regression/15.0.html +++ b/fixtures/devtools/regression/15.0.html @@ -5,6 +5,11 @@ React 15.0 + diff --git a/fixtures/devtools/regression/15.1.html b/fixtures/devtools/regression/15.1.html index 347540a50d9e0..49813d80a19d6 100644 --- a/fixtures/devtools/regression/15.1.html +++ b/fixtures/devtools/regression/15.1.html @@ -5,6 +5,12 @@ React 15.1 + + diff --git a/fixtures/devtools/regression/15.2.html b/fixtures/devtools/regression/15.2.html index 1a9604370cb20..2be6f7c41aae3 100644 --- a/fixtures/devtools/regression/15.2.html +++ b/fixtures/devtools/regression/15.2.html @@ -5,6 +5,12 @@ React 15.2 + + diff --git a/fixtures/devtools/regression/15.3.html b/fixtures/devtools/regression/15.3.html index 4011bc352c3d2..cc5c3960d2a44 100644 --- a/fixtures/devtools/regression/15.3.html +++ b/fixtures/devtools/regression/15.3.html @@ -5,6 +5,12 @@ React 15.3 + + diff --git a/fixtures/devtools/regression/15.4.html b/fixtures/devtools/regression/15.4.html index f47452a6249df..93b425a644b6f 100644 --- a/fixtures/devtools/regression/15.4.html +++ b/fixtures/devtools/regression/15.4.html @@ -5,6 +5,12 @@ React 15.4 + + diff --git a/fixtures/devtools/regression/15.5.html b/fixtures/devtools/regression/15.5.html index 6150198a41747..75f722ccabfe6 100644 --- a/fixtures/devtools/regression/15.5.html +++ b/fixtures/devtools/regression/15.5.html @@ -5,6 +5,12 @@ React 15.5 + + diff --git a/fixtures/devtools/regression/15.6.html b/fixtures/devtools/regression/15.6.html index ed4bd18586faf..0ec03ee51d123 100644 --- a/fixtures/devtools/regression/15.6.html +++ b/fixtures/devtools/regression/15.6.html @@ -5,6 +5,12 @@ React 15.6 + + diff --git a/fixtures/devtools/regression/16.0.html b/fixtures/devtools/regression/16.0.html index 75a527525e57e..1e1403372ca43 100644 --- a/fixtures/devtools/regression/16.0.html +++ b/fixtures/devtools/regression/16.0.html @@ -5,6 +5,12 @@ React 16.0 + + diff --git a/fixtures/devtools/regression/16.1.html b/fixtures/devtools/regression/16.1.html index a04afe853fef2..a6131e9ae1ce9 100644 --- a/fixtures/devtools/regression/16.1.html +++ b/fixtures/devtools/regression/16.1.html @@ -5,6 +5,12 @@ React 16.1 + + diff --git a/fixtures/devtools/regression/16.2.html b/fixtures/devtools/regression/16.2.html index 457f807365492..4d0468d343428 100644 --- a/fixtures/devtools/regression/16.2.html +++ b/fixtures/devtools/regression/16.2.html @@ -5,6 +5,12 @@ React 16.2 + + diff --git a/fixtures/devtools/regression/16.3.html b/fixtures/devtools/regression/16.3.html index 97f079455e532..335adaeffead1 100644 --- a/fixtures/devtools/regression/16.3.html +++ b/fixtures/devtools/regression/16.3.html @@ -5,6 +5,12 @@ React 16.3 + + diff --git a/fixtures/devtools/regression/16.4.html b/fixtures/devtools/regression/16.4.html index 66cd698f9c220..8a881ea3fe059 100644 --- a/fixtures/devtools/regression/16.4.html +++ b/fixtures/devtools/regression/16.4.html @@ -5,6 +5,12 @@ React 16.4 + + diff --git a/fixtures/devtools/regression/16.5.html b/fixtures/devtools/regression/16.5.html index cc5c6dcc2e041..ad91102b1b609 100644 --- a/fixtures/devtools/regression/16.5.html +++ b/fixtures/devtools/regression/16.5.html @@ -5,6 +5,12 @@ React 16.5 + + diff --git a/fixtures/devtools/regression/16.6.html b/fixtures/devtools/regression/16.6.html index 5bd63653ee863..aa8ae33837e57 100644 --- a/fixtures/devtools/regression/16.6.html +++ b/fixtures/devtools/regression/16.6.html @@ -5,6 +5,12 @@ React 16.6 + + diff --git a/fixtures/devtools/regression/16.7.html b/fixtures/devtools/regression/16.7.html index 85acad6674ec6..76fb9823014c2 100644 --- a/fixtures/devtools/regression/16.7.html +++ b/fixtures/devtools/regression/16.7.html @@ -5,6 +5,12 @@ React 16.7 + + diff --git a/fixtures/devtools/regression/canary.html b/fixtures/devtools/regression/canary.html index 20c7ed452cad7..88cadef4ccaf6 100644 --- a/fixtures/devtools/regression/canary.html +++ b/fixtures/devtools/regression/canary.html @@ -5,6 +5,12 @@ React canary + + diff --git a/fixtures/devtools/regression/next.html b/fixtures/devtools/regression/next.html index 2dde165ba3256..4ac0751a0c22d 100644 --- a/fixtures/devtools/regression/next.html +++ b/fixtures/devtools/regression/next.html @@ -5,6 +5,12 @@ React next + + diff --git a/packages/react-devtools-extensions/README.md b/packages/react-devtools-extensions/README.md index aada529ded1d4..cef2bc9c6db3b 100644 --- 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 index b41558d4815fb..f8abb8f49ec28 100644 --- a/packages/react-devtools-extensions/chrome/manifest.json +++ b/packages/react-devtools-extensions/chrome/manifest.json @@ -46,8 +46,7 @@ { "matches": [""], "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 index f9040079a6133..9e3b46f73a873 100644 --- a/packages/react-devtools-extensions/edge/manifest.json +++ b/packages/react-devtools-extensions/edge/manifest.json @@ -46,8 +46,7 @@ { "matches": [""], "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 index 766cad8c625ac..d380a6dbdad2f 100644 --- a/packages/react-devtools-extensions/firefox/manifest.json +++ b/packages/react-devtools-extensions/firefox/manifest.json @@ -50,8 +50,7 @@ { "matches": [""], "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 index 1555bb9da63b4..f9f65df7fb9c8 100644 --- a/packages/react-devtools-shared/src/hook.js +++ b/packages/react-devtools-shared/src/hook.js @@ -21,25 +21,6 @@ export function installHook(target: any): DevToolsHook | null { return null; } - function getMainWindow(targetWindow: any): any { - if (!canAccessParentWindow(targetWindow) || isMainWindow(targetWindow)) { - return targetWindow; - } - return getMainWindow(targetWindow.parent); - } - - function isMainWindow(targetWindow: any): boolean { - return targetWindow.self === targetWindow.top; - } - - function canAccessParentWindow(targetWindow: any): boolean { - try { - return !!targetWindow.parent.origin; - } catch (error) { - return false; - } - } - function detectReactBuildType(renderer) { try { if (typeof renderer.version === 'string') { @@ -301,34 +282,30 @@ export function installHook(target: any): DevToolsHook | null { const listeners = {}; const renderers = new Map(); - let hook: DevToolsHook; - if (!canAccessParentWindow(target) || isMainWindow(target)) { - hook = { - rendererInterfaces, - listeners, - - // Fast Refresh for web relies on this. - renderers, - - emit, - getFiberRoots, - inject, - on, - off, - sub, - - // This is a legacy flag. - // React v16 checks the hook for this to ensure DevTools is new enough. - supportsFiber: true, - - // React calls these methods. - checkDCE, - onCommitFiberUnmount, - onCommitFiberRoot, - }; - } else { - hook = getMainWindow(target).__REACT_DEVTOOLS_GLOBAL_HOOK__; - } + const hook: DevToolsHook = { + rendererInterfaces, + listeners, + + // Fast Refresh for web relies on this. + renderers, + + emit, + getFiberRoots, + inject, + on, + off, + sub, + + // This is a legacy flag. + // React v16 checks the hook for this to ensure DevTools is new enough. + supportsFiber: true, + + // React calls these methods. + checkDCE, + onCommitFiberUnmount, + onCommitFiberRoot, + }; + Object.defineProperty( target, '__REACT_DEVTOOLS_GLOBAL_HOOK__',