Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for react 0.14 #81

Merged
merged 1 commit into from
Nov 21, 2015
Merged

Add support for react 0.14 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/utils/serve.js
View file
Open in desktop
Expand Up @@ -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');
Expand Down Expand Up @@ -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);
}
Expand Down
5 changes: 3 additions & 2 deletions lib/utils/static-entry.jsx
View file
Open in desktop
@@ -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');
Expand Down Expand Up @@ -41,7 +42,7 @@ module.exports = function(locals, callback) {
body = "";
html = "";
try {
body = React.renderToString(
body = ReactDOMServer.renderToString(
<Handler
config={config}
pages={pages}
Expand All @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion lib/utils/web-entry.jsx
View file
Open in desktop
@@ -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');
Expand Down Expand Up @@ -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}
Expand Down
13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Expand Up @@ -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",
Expand All @@ -41,16 +41,17 @@
"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.12.3",
"style-loader": "^0.13.0",
"toml": "^2.2.2",
"toml-loader": "^1.0.0",
"typography": "^0.3.5",
"typography": "^0.6.2",
"underscore": "^1.8.3",
"underscore.string": "^3.1.1",
"webpack": "^1.9.8",
Expand Down