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.

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

Fix Cannot read property 'sub' of undefined when navigating to plain-text pages #17848

Merged
2 changes: 2 additions & 0 deletions packages/react-devtools-core/src/backend.js
Expand Up @@ -158,6 +158,8 @@ export function connectToDevTools(options: ?ConnectOptions) {

// TODO (npm-packages) Warn if "isBackendStorageAPISupported"
const agent = new Agent(bridge);
if (hook == null) return;
wfnuser marked this conversation as resolved.
Show resolved Hide resolved

agent.addListener('shutdown', () => {
// If we received 'shutdown' from `agent`, we assume the `bridge` is already shutting down,
// and that caused the 'shutdown' event on the `agent`, so we don't need to call `bridge.shutdown()` here.
Expand Down
6 changes: 5 additions & 1 deletion packages/react-devtools-extensions/src/backend.js
Expand Up @@ -22,6 +22,10 @@ function welcome(event) {
window.addEventListener('message', welcome);

function setup(hook) {
if (hook == null) {
// DevTools didn't get injected into this page (maybe b'c of the contentType).
return;
}
const Agent = require('react-devtools-shared/src/backend/agent').default;
const Bridge = require('react-devtools-shared/src/bridge').default;
const {initBackend} = require('react-devtools-shared/src/backend');
Expand Down Expand Up @@ -72,7 +76,7 @@ function setup(hook) {
bridge.send('extensionBackendInitialized');

// Setup React Native style editor if a renderer like react-native-web has injected it.
if (hook.resolveRNStyle) {
if (hook && hook.resolveRNStyle) {
wfnuser marked this conversation as resolved.
Show resolved Hide resolved
setupNativeStyleEditor(
bridge,
agent,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-devtools-extensions/src/injectGlobalHook.js
Expand Up @@ -88,7 +88,7 @@ if (sessionStorageGetItem(SESSION_STORAGE_RELOAD_AND_PROFILE_KEY) === 'true') {

// Inject a __REACT_DEVTOOLS_GLOBAL_HOOK__ global for React to interact with.
// Only do this for HTML documents though, to avoid e.g. breaking syntax highlighting for XML docs.
if (document.contentType === 'text/html') {
if ('text/html' === document.contentType) {
injectCode(
';(' +
installHook.toString() +
Expand Down
2 changes: 1 addition & 1 deletion packages/react-devtools-inline/src/backend.js
Expand Up @@ -77,7 +77,7 @@ function finishActivation(contentWindow: window) {
initBackend(hook, agent, contentWindow);

// Setup React Native style editor if a renderer like react-native-web has injected it.
if (hook.resolveRNStyle) {
if (hook && hook.resolveRNStyle) {
wfnuser marked this conversation as resolved.
Show resolved Hide resolved
setupNativeStyleEditor(
bridge,
agent,
Expand Down
4 changes: 4 additions & 0 deletions packages/react-devtools-shared/src/backend/index.js
Expand Up @@ -19,6 +19,10 @@ export function initBackend(
agent: Agent,
global: Object,
): () => void {
if (hook == null) {
// DevTools didn't get injected into this page (maybe b'c of the contentType).
return () => {};
}
const subs = [
hook.sub(
'renderer-attached',
Expand Down