Skip to content

Commit 461cd84

Browse files
author
Brian Vaughn
authored
Revert "DevTools: Improve browser extension iframe support (#19854)" (#19959)
This reverts commit a99bf5c.
1 parent cc77be9 commit 461cd84

30 files changed

+134
-149
lines changed

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

-23
This file was deleted.

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

-7
This file was deleted.

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

-7
This file was deleted.

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

-7
This file was deleted.

‎fixtures/devtools/iframe/index.html

-14
This file was deleted.

‎fixtures/devtools/iframe/main.html

-19
This file was deleted.

‎fixtures/devtools/iframe/server.js

-18
This file was deleted.

‎fixtures/devtools/regression/14.9.html

+6
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/react@0.14.9/dist/react.js"></script>
915
<script src="https://unpkg.com/react-dom@0.14.9/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.0.html

+5
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/react@15.0/dist/react.js"></script>
1015
<script src="https://unpkg.com/react-dom@15.0/dist/react-dom.js"></script>

‎fixtures/devtools/regression/15.1.html

+6
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/react@15.1/dist/react.js"></script>
915
<script src="https://unpkg.com/react-dom@15.1/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.2.html

+6
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/react@15.2/dist/react.js"></script>
915
<script src="https://unpkg.com/react-dom@15.2/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.3.html

+6
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/react@15.3/dist/react.js"></script>
915
<script src="https://unpkg.com/react-dom@15.3/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.4.html

+6
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/react@15.4/dist/react.js"></script>
915
<script src="https://unpkg.com/react-dom@15.4/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.5.html

+6
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/react@15.5/dist/react.js"></script>
915
<script src="https://unpkg.com/react-dom@15.5/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/15.6.html

+6
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/react@15.6/dist/react.js"></script>
915
<script src="https://unpkg.com/react-dom@15.6/dist/react-dom.js"></script>
1016

‎fixtures/devtools/regression/16.0.html

+6
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/react@16.0/umd/react.development.js"></script>
915
<script src="https://unpkg.com/react-dom@16.0/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.1.html

+6
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/react@16.1/umd/react.development.js"></script>
915
<script src="https://unpkg.com/react-dom@16.1/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.2.html

+6
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/react@16.2/umd/react.development.js"></script>
915
<script src="https://unpkg.com/react-dom@16.2/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.3.html

+6
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/react@16.3/umd/react.development.js"></script>
915
<script src="https://unpkg.com/react-dom@16.3/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.4.html

+6
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/react@16.4/umd/react.development.js"></script>
915
<script src="https://unpkg.com/react-dom@16.4/umd/react-dom.development.js"></script>
1016

‎fixtures/devtools/regression/16.5.html

+6
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/schedule@0.5.0/umd/schedule.development.js"></script>
915
<script src="https://unpkg.com/schedule@0.5.0/umd/schedule-tracing.development.js"></script>
1016
<script src="https://unpkg.com/react@16.5/umd/react.development.js"></script>

‎fixtures/devtools/regression/16.6.html

+6
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/scheduler@0.10.0/umd/scheduler.development.js"></script>
915
<script src="https://unpkg.com/scheduler@0.10.0/umd/scheduler-tracing.development.js"></script>
1016
<script src="https://unpkg.com/react@16.6/umd/react.development.js"></script>

‎fixtures/devtools/regression/16.7.html

+6
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/scheduler@0.12.0/umd/scheduler.development.js"></script>
915
<script src="https://unpkg.com/scheduler@0.12.0/umd/scheduler-tracing.development.js"></script>
1016
<script src="https://unpkg.com/react@16.7/umd/react.development.js"></script>

‎fixtures/devtools/regression/canary.html

+6
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

+6
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

-3
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

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
{
5454
"matches": ["<all_urls>"],
5555
"js": ["build/injectGlobalHook.js"],
56-
"run_at": "document_start",
57-
"all_frames": true
56+
"run_at": "document_start"
5857
}
5958
]
6059
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
{
5454
"matches": ["<all_urls>"],
5555
"js": ["build/injectGlobalHook.js"],
56-
"run_at": "document_start",
57-
"all_frames": true
56+
"run_at": "document_start"
5857
}
5958
]
6059
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
{
5858
"matches": ["<all_urls>"],
5959
"js": ["build/injectGlobalHook.js"],
60-
"run_at": "document_start",
61-
"all_frames": true
60+
"run_at": "document_start"
6261
}
6362
]
6463
}

0 commit comments

Comments
 (0)