Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moved backend injection to the content script #16752

Merged
merged 8 commits into from
Sep 11, 2019
Merged

Moved backend injection to the content script #16752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c93038f
Moved backend injection logic to content script
onionymous Sep 11, 2019
788036c
Moved backend injection logic to content script
onionymous Sep 11, 2019
85c7211
Moved injection logic to content script
onionymous Sep 11, 2019
d51f062
Formatting changes
onionymous Sep 11, 2019
8a6cd3c
remove ability to inject arbitrary scripts
onionymous Sep 11, 2019
2e75000
Removed done(), added some comments explaining the change
onionymous Sep 11, 2019
776d1c6
Lint fixes
onionymous Sep 11, 2019
f09854a
Moved inline comment.
bvaughn Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions packages/react-devtools-extensions/src/injectGlobalHook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,26 @@ let lastDetectionResult;
// So instead, the hook will use postMessage() to pass message to us here.
// And when this happens, we'll send a message to the "background page".
window.addEventListener('message', function(evt) {
if (
evt.source === window &&
evt.data &&
evt.data.source === 'react-devtools-detector'
) {
lastDetectionResult = {
hasDetectedReact: true,
reactBuildType: evt.data.reactBuildType,
};
chrome.runtime.sendMessage(lastDetectionResult);
if (evt.source === window && evt.data) {
if (evt.data.source === 'react-devtools-detector') {
lastDetectionResult = {
hasDetectedReact: true,
reactBuildType: evt.data.reactBuildType,
};
chrome.runtime.sendMessage(lastDetectionResult);
} else if (evt.data.source === 'react-devtools-inject-backend') {
// The backend is injected by the content script to avoid CSP and Trusted Types violations,
// since content scripts can modify the DOM and are not subject to the page's policies.
// The prototype stuff is in case document.createElement has been modified.
const script = document.constructor.prototype.createElement.call(
document,
'script',
);
script.src = chrome.runtime.getURL('build/backend.js');
script.charset = 'utf-8';
document.documentElement.appendChild(script);
script.parentNode.removeChild(script);
}
}
});

Expand Down
10 changes: 8 additions & 2 deletions packages/react-devtools-extensions/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {createElement} from 'react';
import {unstable_createRoot as createRoot, flushSync} from 'react-dom';
import Bridge from 'react-devtools-shared/src/bridge';
import Store from 'react-devtools-shared/src/devtools/store';
import inject from './inject';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the only use of the inject.js module, so we can delete that now.

import {
createViewElementSource,
getBrowserName,
Expand Down Expand Up @@ -135,7 +134,14 @@ function createPanelIfReactLoaded() {

// Initialize the backend only once the Store has been initialized.
// Otherwise the Store may miss important initial tree op codes.
inject(chrome.runtime.getURL('build/backend.js'));
chrome.devtools.inspectedWindow.eval(
`window.postMessage({ source: 'react-devtools-inject-backend' });`,
function(response, evalError) {
if (evalError) {
console.log(evalError);
}
},
);

const viewElementSourceFunction = createViewElementSource(
bridge,
Expand Down