Merge pull request markfinger#4 from Ppjet6/react-0.14

Require react-dom/server for renderTo* functions
cratejoy · Nov 5, 2015 · fbc9ce0 · fbc9ce0
2 parents e0425f0 + 60e7b62
commit fbc9ce0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/Component.js b/lib/Component.js
@@ -1,4 +1,5 @@
 var React = require('react');
+var ReactDOMServer = require('react-dom/server');
 var path = require('path');
 
 var Component = function Component(opts) {
@@ -69,8 +70,10 @@ Component.prototype._render = function _render(props, toStaticMarkup, cb) {
     if (err) return cb(err);
 
     var render = (
-      toStaticMarkup ? React.renderToStaticMarkup : React.renderToString
-    ).bind(React);
+      toStaticMarkup
+        ? ReactDOMServer.renderToStaticMarkup
+        : ReactDOMServer.renderToString
+    ).bind(ReactDOMServer);
 
     try {
       var markup = render(factory(props));

diff --git a/package.json b/package.json
@@ -22,7 +22,8 @@
   "devDependencies": {
     "chai": "^3.0.0",
     "mocha": "^2.2.5",
-    "react": "^0.13.3"
+    "react": "^0.14.2",
+    "react-dom": "^0.14.2"
   },
   "scripts": {
     "test": "mocha"