Skip to content

Commit

Permalink
Revert "DevTools: Improve browser extension iframe support (#19854)" (#…
Browse files Browse the repository at this point in the history
…19959)

This reverts commit a99bf5c.
  • Loading branch information
Brian Vaughn authored Oct 5, 2020
1 parent cc77be9 commit 461cd84
Show file tree
Hide file tree
Showing 30 changed files with 134 additions and 149 deletions.
23 changes: 0 additions & 23 deletions fixtures/devtools/iframe/iframe-in-component.html

This file was deleted.

7 changes: 0 additions & 7 deletions fixtures/devtools/iframe/iframe-other-origin.html

This file was deleted.

7 changes: 0 additions & 7 deletions fixtures/devtools/iframe/iframe-same-origin-sandbox.html

This file was deleted.

7 changes: 0 additions & 7 deletions fixtures/devtools/iframe/iframe-same-origin.html

This file was deleted.

14 changes: 0 additions & 14 deletions fixtures/devtools/iframe/index.html

This file was deleted.

19 changes: 0 additions & 19 deletions fixtures/devtools/iframe/main.html

This file was deleted.

18 changes: 0 additions & 18 deletions fixtures/devtools/iframe/server.js

This file was deleted.

6 changes: 6 additions & 0 deletions fixtures/devtools/regression/14.9.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 5 additions & 0 deletions fixtures/devtools/regression/15.0.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/15.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/15.2.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/15.3.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/15.4.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/15.5.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/15.6.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/16.0.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/16.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/16.2.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/16.3.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/16.4.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/16.5.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/16.6.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/16.7.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/canary.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions fixtures/devtools/regression/next.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions packages/react-devtools-extensions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
3 changes: 1 addition & 2 deletions packages/react-devtools-extensions/chrome/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
{
"matches": ["<all_urls>"],
"js": ["build/injectGlobalHook.js"],
"run_at": "document_start",
"all_frames": true
"run_at": "document_start"
}
]
}
3 changes: 1 addition & 2 deletions packages/react-devtools-extensions/edge/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
{
"matches": ["<all_urls>"],
"js": ["build/injectGlobalHook.js"],
"run_at": "document_start",
"all_frames": true
"run_at": "document_start"
}
]
}
3 changes: 1 addition & 2 deletions packages/react-devtools-extensions/firefox/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@
{
"matches": ["<all_urls>"],
"js": ["build/injectGlobalHook.js"],
"run_at": "document_start",
"all_frames": true
"run_at": "document_start"
}
]
}
Loading

0 comments on commit 461cd84

Please sign in to comment.