Restore DevTools console message (facebook#21864)

gaearon · zhengjitf · commit ccfc71edbdcd · 2022-04-15T14:00:25.000+08:00
diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.new.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.new.js
@@ -69,8 +69,13 @@ export function injectInternals(internals: Object): boolean {
       console.error('React instrumentation encountered an error: %s.', err);
     }
   }
-  // DevTools exists
-  return true;
+  if (hook.checkDCE) {
+    // This is the real DevTools.
+    return true;
+  } else {
+    // This is likely a hook installed by Fast Refresh runtime.
+    return false;
+  }
 }
 
 export function onScheduleRoot(root: FiberRoot, children: ReactNodeList) {
diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.old.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.old.js
@@ -69,8 +69,13 @@ export function injectInternals(internals: Object): boolean {
       console.error('React instrumentation encountered an error: %s.', err);
     }
   }
-  // DevTools exists
-  return true;
+  if (hook.checkDCE) {
+    // This is the real DevTools.
+    return true;
+  } else {
+    // This is likely a hook installed by Fast Refresh runtime.
+    return false;
+  }
 }
 
 export function onScheduleRoot(root: FiberRoot, children: ReactNodeList) {

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,13 @@ export function injectInternals(internals: Object): boolean {`
`69`	`69`	`console.error('React instrumentation encountered an error: %s.', err);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`		`- // DevTools exists`
`73`		`- return true;`
	`72`	`+ if (hook.checkDCE) {`
	`73`	`+ // This is the real DevTools.`
	`74`	`+ return true;`
	`75`	`+ } else {`
	`76`	`+ // This is likely a hook installed by Fast Refresh runtime.`
	`77`	`+ return false;`
	`78`	`+ }`
`74`	`79`	`}`
`75`	`80`
`76`	`81`	`export function onScheduleRoot(root: FiberRoot, children: ReactNodeList) {`