Make sure to pass the extension ID to all postMessages handled by inj…

…ectGlobalHook
facebook · Oct 12, 2021 · aec8557 · aec8557
1 parent bc3fff6
commit aec8557
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/react-devtools-extensions/src/injectGlobalHook.js b/packages/react-devtools-extensions/src/injectGlobalHook.js
@@ -116,6 +116,7 @@ window.__REACT_DEVTOOLS_GLOBAL_HOOK__.on('renderer', function({reactBuildType})
   window.postMessage({
     source: 'react-devtools-detector',
     reactBuildType,
+    extensionId: "${CURRENT_EXTENSION_ID}",
   }, '*');
 });
 `;

diff --git a/packages/react-devtools-extensions/src/main.js b/packages/react-devtools-extensions/src/main.js
@@ -217,7 +217,10 @@ function createPanelIfReactLoaded() {
           // Initialize the backend only once the Store has been initialized.
           // Otherwise the Store may miss important initial tree op codes.
           chrome.devtools.inspectedWindow.eval(
-            `window.postMessage({ source: 'react-devtools-inject-backend', extensionId: "${CURRENT_EXTENSION_ID}" }, '*');`,
+            `window.postMessage({
+               source: 'react-devtools-inject-backend',
+               extensionId: "${CURRENT_EXTENSION_ID}"
+             }, '*');`,
             function(response, evalError) {
               if (evalError) {
                 console.error(evalError);
@@ -363,6 +366,7 @@ function createPanelIfReactLoaded() {
               chrome.devtools.inspectedWindow.eval(`
               window.postMessage({
                 source: 'react-devtools-extension',
+                extensionId: "${CURRENT_EXTENSION_ID}"
                 payload: {
                   type: 'fetch-file-with-cache',
                   url: "${url}",