From e3ff278d0eb913525c383688cd0023a510863352 Mon Sep 17 00:00:00 2001 From: Gabriel Bull Date: Mon, 3 Oct 2016 23:50:43 -0400 Subject: [PATCH] Fixed issue with render not resolving --- .npmignore | 2 ++ CHANGELOG.md | 4 ++++ package.json | 3 ++- src/asyncRenderer.js | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.npmignore b/.npmignore index 75e422b..241e921 100644 --- a/.npmignore +++ b/.npmignore @@ -10,3 +10,5 @@ /.travis.yml /CONTRIBUTING.md /npm-debug.log +/src +/react-router-server.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 99d3117..18f564c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/package.json b/package.json index c32f500..d22dc97 100644 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/src/asyncRenderer.js b/src/asyncRenderer.js index 27e5d97..913c4c3 100644 --- a/src/asyncRenderer.js +++ b/src/asyncRenderer.js @@ -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; } }