diff --git a/devtools/client/jsonview/json-viewer.js b/devtools/client/jsonview/json-viewer.js index b680eb0bed98..5300db3ae370 100644 --- a/devtools/client/jsonview/json-viewer.js +++ b/devtools/client/jsonview/json-viewer.js @@ -7,7 +7,7 @@ define(function(require, exports, module) { // ReactJS -const React = require("react"); +const ReactDOM = require("react-dom"); // RDP Inspector const { createFactories } = require("./components/reps/rep-utils"); @@ -79,7 +79,7 @@ input.actions = { * at the top of the window. This component also represents ReacJS root. */ var content = document.getElementById("content"); -var theApp = React.render(MainTabbedArea(input), content); +var theApp = ReactDOM.render(MainTabbedArea(input), content); var onResize = event => { window.document.body.style.height = window.innerHeight + "px"; diff --git a/devtools/client/jsonview/viewer-config.js b/devtools/client/jsonview/viewer-config.js index 0869a20864e9..9b881ebddb61 100644 --- a/devtools/client/jsonview/viewer-config.js +++ b/devtools/client/jsonview/viewer-config.js @@ -23,7 +23,8 @@ require.config({ "react": [ "resource://devtools/client/shared/vendor/react-dev", "resource://devtools/client/shared/vendor/react" - ] + ], + "react-dom": "resource://devtools/client/shared/vendor/react-dom" } }); diff --git a/devtools/client/memory/components/test/mochitest/test_tree_01.html b/devtools/client/memory/components/test/mochitest/test_tree_01.html index 89609562c6ba..ed5312fc62bb 100644 --- a/devtools/client/memory/components/test/mochitest/test_tree_01.html +++ b/devtools/client/memory/components/test/mochitest/test_tree_01.html @@ -16,6 +16,7 @@ depth.