Merge pull request #81 from Syncano/react-0.14

Add support for react 0.14
gatsbyjs · Nov 21, 2015 · 018fccf · 018fccf
2 parents 17cf279 + 809f17c
commit 018fccf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git 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 = "<!DOCTYPE html>\n" + html;
         return reply(html);
       }

diff --git 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(
         <Handler
           config={config}
           pages={pages}
@@ -50,7 +51,7 @@ module.exports = function(locals, callback) {
           state={state}
         />
       );
-      html = "<!DOCTYPE html>\n" + React.renderToStaticMarkup(
+      html = "<!DOCTYPE html>\n" + ReactDOMServer.renderToStaticMarkup(
         <HTML
           config={config}
           page={page}

diff --git a/lib/utils/web-entry.jsx b/lib/utils/web-entry.jsx
@@ -1,4 +1,5 @@
 var React = require('react');
+var ReactDOM = require('react-dom');
 var Router = require('react-router');
 var find = require('lodash/collection/find');
 var filter = require('lodash/collection/filter');
@@ -44,7 +45,7 @@ loadConfig(function() {
         if (app.onRouteChange) {
           app.onRouteChange(state, page, pages, config);
         }
-        return React.render(
+        return ReactDOM.render(
           <Handler
             config={config}
             pages={pages}

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.9.3",
     "commander": "^2.8.1",
-    "css-loader": "^0.19.0",
+    "css-loader": "^0.22.0",
     "front-matter": "^1.0.0",
     "fs-extra": "^0.19.0",
     "glob": "^5.0.7",
@@ -41,10 +41,11 @@
     "null-loader": "^0.1.1",
     "parse-filepath": "^0.5.0",
     "raw-loader": "^0.5.1",
-    "react": "^0.13.3",
-    "react-document-title": "^1.0.2",
+    "react": "^0.14.2",
+    "react-dom": "^0.14.2",
+    "react-document-title": "^2.0.1",
     "react-hot-loader": "^1.2.7",
-    "react-router": "^0.13.3",
+    "react-router": "^0.13.5",
     "rimraf": "^2.4.2",
     "static-site-generator-webpack-plugin": "^1.0.0",
     "style-loader": "^0.13.0",