diff --git a/lib/utils/serve.js b/lib/utils/serve.js index d83d7e27ac83f..0a000fe17b1f4 100644 --- a/lib/utils/serve.js +++ b/lib/utils/serve.js @@ -2,6 +2,7 @@ require('node-cjsx').transform(); var Hapi = require('hapi'); var Boom = require('boom'); var React = require('react'); +var ReactDOMServer = require('react-dom/server'); var Router = require('react-router'); var path = require('path'); var WebpackDevServer = require('webpack-dev-server'); @@ -69,7 +70,7 @@ module.exports = function(program) { return reply(Boom.notFound()); } - var html = React.renderToStaticMarkup(React.createElement(HTML)); + var html = ReactDOMServer.renderToStaticMarkup(React.createElement(HTML)); html = "\n" + html; return reply(html); } diff --git a/lib/utils/static-entry.jsx b/lib/utils/static-entry.jsx index 9fb8e7ee4dead..9efcac472a3bc 100644 --- a/lib/utils/static-entry.jsx +++ b/lib/utils/static-entry.jsx @@ -1,4 +1,5 @@ var React = require('react'); +var ReactDOMServer = require('react-dom/server'); var Router = require('react-router'); var find = require('lodash/collection/find'); var filter = require('lodash/collection/filter'); @@ -41,7 +42,7 @@ module.exports = function(locals, callback) { body = ""; html = ""; try { - body = React.renderToString( + body = ReactDOMServer.renderToString( ); - html = "\n" + React.renderToStaticMarkup( + html = "\n" + ReactDOMServer.renderToStaticMarkup(