Skip to content

Commit

Permalink
Fixed issue with render not resolving
Browse files Browse the repository at this point in the history
gabrielbull committed Oct 4, 2016
1 parent 98ee7a0 commit e3ff278
Showing 4 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -10,3 +10,5 @@
/.travis.yml
/CONTRIBUTING.md
/npm-debug.log
/src
/react-router-server.svg
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 0.1.3 (October 4th, 2016)

- Fixed issue with render not resolving

## 0.1.2 (October 3rd, 2016)

- Added unit tests
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-router-server",
"author": "Gabriel Bull",
"version": "0.1.2",
"version": "0.1.3",
"description": "Server Side Rendering library for React Router v4",
"main": "./build/index.js",
"keywords": [
@@ -23,6 +23,7 @@
"build": "babel ./src --out-dir ./build",
"build-publish": "npm run build && npm publish",
"watch": "babel-node -- node_modules/.bin/webpack --watch --config ./example/webpack.config.js",
"prestart": "npm run build",
"start": "nodemon --exec node_modules/.bin/babel-node --plugins system-import-transformer -- example/src/server.js",
"test": "mocha test"
},
2 changes: 2 additions & 0 deletions src/asyncRenderer.js
Original file line number Diff line number Diff line change
@@ -28,6 +28,8 @@ class AsyncRenderer {
const markup = renderToString(this.element);
if (!this.awaitForAsyncMount && !this.awaitForAsyncRender) {
this.resolve(markup);
} else if (!this.awaitForAsyncRender) {
this.renderPass = true;
}
}

0 comments on commit e3ff278

Please sign in to comment.