Skip to content

Dev Tools: Relax constraint on passing extensionId for backend init #22597

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

Merged
merged 2 commits into from
Oct 20, 2021
Merged

Dev Tools: Relax constraint on passing extensionId for backend init #22597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a233010
Dev Tools: Relax constraint on passing extensionId for backend init
Oct 19, 2021
5760cef
Add extensionId to other postMessage calls
Oct 20, 2021
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
8 changes: 5 additions & 3 deletions packages/react-devtools-extensions/src/backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Running module factories is intentionally delayed until we know the hook exists.
// This is to avoid issues like: https://github.com/facebook/react-devtools/issues/1039

/** @flow */
// @flow strict-local

'use strict';

Expand All @@ -13,15 +13,16 @@ function welcome(event) {
) {
return;
}
const extensionId = event.data.extensionId;

window.removeEventListener('message', welcome);

setup(window.__REACT_DEVTOOLS_GLOBAL_HOOK__);
setup(window.__REACT_DEVTOOLS_GLOBAL_HOOK__, extensionId);
}

window.addEventListener('message', welcome);

function setup(hook) {
function setup(hook, extensionId) {
if (hook == null) {
// DevTools didn't get injected into this page (maybe b'c of the contentType).
return;
Expand Down Expand Up @@ -55,6 +56,7 @@ function setup(hook) {
{
source: 'react-devtools-bridge',
payload: {event, payload},
extensionId,
},
'*',
transferable,
Expand Down
5 changes: 5 additions & 0 deletions packages/react-devtools-extensions/src/contentScript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

'use strict';

import {CURRENT_EXTENSION_ID} from './constants';

let backendDisconnected: boolean = false;
let backendInitialized: boolean = false;

Expand All @@ -10,6 +12,7 @@ function sayHelloToBackend() {
{
source: 'react-devtools-content-script',
hello: true,
extensionId: CURRENT_EXTENSION_ID,
},
'*',
);
Expand All @@ -20,6 +23,7 @@ function handleMessageFromDevtools(message) {
{
source: 'react-devtools-content-script',
payload: message,
extensionId: CURRENT_EXTENSION_ID,
},
'*',
);
Expand Down Expand Up @@ -49,6 +53,7 @@ function handleDisconnect() {
type: 'event',
event: 'shutdown',
},
extensionId: CURRENT_EXTENSION_ID,
},
'*',
);
Expand Down
4 changes: 3 additions & 1 deletion packages/react-devtools-extensions/src/injectGlobalHook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ window.addEventListener('message', function onMessage({data, source}) {
if (source !== window || !data) {
return;
}
if (data.extensionId !== CURRENT_EXTENSION_ID) {
if (data.extensionId != null && data.extensionId !== CURRENT_EXTENSION_ID) {
if (__DEBUG__) {
console.log(
`[injectGlobalHook] Received message '${data.source}' from different extension instance. Skipping message.`,
{
currentExtension: EXTENSION_INSTALLATION_TYPE,
currentExtensionId: CURRENT_EXTENSION_ID,
providedExtensionId: data.extensionId,
},
);
}
Expand Down