Merge pull request #78 from ericclemmons/78-routes-not-firing

Regression with HistoryLocation in React v0.13 Example
ericclemmons · Sep 7, 2015 · 1cf7802 · 1cf7802
2 parents 6c964c8 + 7dc2f49
commit 1cf7802
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git 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
+  + <https://github.com/ericclemmons/react-resolver/pull/78>
+  + <https://github.com/ericclemmons/react-resolver/issues/75>
+
+
 ### v2.0.4 - (2015-08-25)
 
 - Support _thenables_

diff --git 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
@@ -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(<Resolved />, node);
-        })
-      ;
-    }
-
     // @TODO - Use react-dom.render
     React.render((
       <Resolver data={data}>