Skip to content

Commit 26857ec

Browse files
author
Brian Vaughn
authored
Revert "DevTools: Improve browser extension iframe support (#19827)" (#19852)
This reverts commit ec39a5e.
1 parent 6fddca2 commit 26857ec

30 files changed

+134
-151
lines changed

‎fixtures/devtools/iframe/iframe-in-component.html

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎fixtures/devtools/iframe/iframe-other-origin.html

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎fixtures/devtools/iframe/iframe-same-origin-sandbox.html

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎fixtures/devtools/iframe/iframe-same-origin.html

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎fixtures/devtools/iframe/index.html

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎fixtures/devtools/iframe/main.html

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎fixtures/devtools/iframe/server.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎fixtures/devtools/regression/14.9.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 14.9</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/dist/react.js"></script>
915
<script src="https://unpkg.com/[email protected]/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.0.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
<title>React 15.0</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
813

914
<script src="https://unpkg.com/[email protected]/dist/react.js"></script>
1015
<script src="https://unpkg.com/[email protected]/dist/react-dom.js"></script>

‎fixtures/devtools/regression/15.1.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 15.1</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/dist/react.js"></script>
915
<script src="https://unpkg.com/[email protected]/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.2.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 15.2</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/dist/react.js"></script>
915
<script src="https://unpkg.com/[email protected]/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.3.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 15.3</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/dist/react.js"></script>
915
<script src="https://unpkg.com/[email protected]/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.4.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 15.4</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/dist/react.js"></script>
915
<script src="https://unpkg.com/[email protected]/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.5.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 15.5</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/dist/react.js"></script>
915
<script src="https://unpkg.com/[email protected]/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.6.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 15.6</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/dist/react.js"></script>
915
<script src="https://unpkg.com/[email protected]/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/16.0.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 16.0</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/umd/react.development.js"></script>
915
<script src="https://unpkg.com/[email protected]/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.1.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 16.1</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/umd/react.development.js"></script>
915
<script src="https://unpkg.com/[email protected]/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.2.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 16.2</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/umd/react.development.js"></script>
915
<script src="https://unpkg.com/[email protected]/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.3.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 16.3</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/umd/react.development.js"></script>
915
<script src="https://unpkg.com/[email protected]/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.4.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 16.4</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/umd/react.development.js"></script>
915
<script src="https://unpkg.com/[email protected]/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.5.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 16.5</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/umd/schedule.development.js"></script>
915
<script src="https://unpkg.com/[email protected]/umd/schedule-tracing.development.js"></script>
1016
<script src="https://unpkg.com/[email protected]/umd/react.development.js"></script>

‎fixtures/devtools/regression/16.6.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 16.6</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/umd/scheduler.development.js"></script>
915
<script src="https://unpkg.com/[email protected]/umd/scheduler-tracing.development.js"></script>
1016
<script src="https://unpkg.com/[email protected]/umd/react.development.js"></script>

‎fixtures/devtools/regression/16.7.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React 16.7</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/[email protected]/umd/scheduler.development.js"></script>
915
<script src="https://unpkg.com/[email protected]/umd/scheduler-tracing.development.js"></script>
1016
<script src="https://unpkg.com/[email protected]/umd/react.development.js"></script>

‎fixtures/devtools/regression/canary.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React canary</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/scheduler@canary/umd/scheduler.development.js"></script>
915
<script src="https://unpkg.com/scheduler@canary/umd/scheduler-tracing.development.js"></script>
1016
<script src="https://unpkg.com/react@canary/umd/react.development.js"></script>

‎fixtures/devtools/regression/next.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<title>React next</title>
66
<link rel="stylesheet" href="styles.css" />
77

8+
<script type="text/javascript">
9+
// Enable DevTools to inspect React inside of an <iframe>
10+
// This must run before React is loaded
11+
__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
12+
</script>
13+
814
<script src="https://unpkg.com/scheduler@next/umd/scheduler.development.js"></script>
915
<script src="https://unpkg.com/scheduler@next/umd/scheduler-tracing.development.js"></script>
1016
<script src="https://unpkg.com/react@next/umd/react.development.js"></script>

‎packages/react-devtools-extensions/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,4 @@ yarn run test:chrome # Test Chrome extension
3434

3535
yarn build:firefox # => packages/react-devtools-extensions/firefox/build
3636
yarn run test:firefox # Test Firefox extension
37-
38-
yarn build:edge # => packages/react-devtools-extensions/edge/build
39-
yarn run test:edge # Test Edge extension
4037
```

‎packages/react-devtools-extensions/chrome/manifest.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
{
4747
"matches": ["<all_urls>"],
4848
"js": ["build/injectGlobalHook.js"],
49-
"run_at": "document_start",
50-
"all_frames": true
49+
"run_at": "document_start"
5150
}
5251
]
5352
}

‎packages/react-devtools-extensions/edge/manifest.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
{
4747
"matches": ["<all_urls>"],
4848
"js": ["build/injectGlobalHook.js"],
49-
"run_at": "document_start",
50-
"all_frames": true
49+
"run_at": "document_start"
5150
}
5251
]
5352
}

‎packages/react-devtools-extensions/firefox/manifest.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
{
5151
"matches": ["<all_urls>"],
5252
"js": ["build/injectGlobalHook.js"],
53-
"run_at": "document_start",
54-
"all_frames": true
53+
"run_at": "document_start"
5554
}
5655
]
5756
}

0 commit comments

Comments
 (0)