diff --git a/CHANGELOG.md b/CHANGELOG.md index 86e26af..dd26266 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # React Resolver Changelog +### v2.0.5 - (2015-09-07) + +- Fix React Router v0.13.3 `HistoryLocation` bug + + + + + + ### v2.0.4 - (2015-08-25) - Support _thenables_ diff --git a/package.json b/package.json index 2d19e53..cd9ccf0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-resolver", - "version": "2.0.4", + "version": "2.0.5", "description": "Async-rendering & data-fetching for universal React applications", "main": "dist/index.js", "directories": { diff --git a/src/Resolver.js b/src/Resolver.js index aa68373..7f21d1f 100644 --- a/src/Resolver.js +++ b/src/Resolver.js @@ -33,17 +33,6 @@ export default class Resolver extends React.Component { } static render = function(render, node, data = window[PAYLOAD]) { - // Server-rendered output, but missing payload - if (node.innerHTML && !data) { - return Resolver - .resolve(render) - .then(({ Resolved }) => { - // @TODO - Use react-dom.render - React.render(, node); - }) - ; - } - // @TODO - Use react-dom.render React.render((