React 16 compatibility, round 2

Thanks @JulienPradet
MoOx · Sep 27, 2017 · ee106d2 · ee106d2 · JulienPradet · Sep 28, 2017
1 parent 1dbc5be
commit ee106d2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/plugin-renderer-react/src/createApp.js b/packages/plugin-renderer-react/src/createApp.js
@@ -10,6 +10,13 @@ import createStore from "./shared/store";
 
 const debug = require("debug")("phenomic:plugin:react");
 
+const render =
+  typeof document !== "undefined" &&
+  !document.querySelector("#phenomic-DevLoader") &&
+  ReactDOM.hydrate
+    ? ReactDOM.hydrate
+    : ReactDOM.render;
+
 let store;
 
 export const renderApp = (routes: () => React.Element<any>) => {
@@ -31,7 +38,7 @@ export const renderApp = (routes: () => React.Element<any>) => {
         : undefined
     );
 
-  ReactDOM.render(
+  render(
     <AppContainer>
       <Provider fetch={createFetchFunction()} store={store}>
         {routes()}