Move lastAppProps back where it should be (vercel#1208)

timneutkens · nkzawa · commit 20c7d98efe0c · 2017-02-20T05:35:48.000+09:00
* Check for lastAppProps

* Move lastAppProps back where it belongs

* Add comment
diff --git a/client/index.js b/client/index.js
@@ -77,11 +77,12 @@ async function doRender ({ Component, props, err, emitter }) {
   props = props || lastAppProps.props
 
   const appProps = { Component, props, err, router, headManager }
+  // lastAppProps has to be set before ReactDom.render to account for ReactDom throwing an error.
+  lastAppProps = appProps
+
   ReactDOM.render(createElement(App, appProps), container)
 
   if (emitter) {
     emitter.emit('after-reactdom-render', { Component })
   }
-
-  lastAppProps = appProps
 }

Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,12 @@ async function doRender ({ Component, props, err, emitter }) {`
`77`	`77`	`props = props \|\| lastAppProps.props`
`78`	`78`
`79`	`79`	`const appProps = { Component, props, err, router, headManager }`
	`80`	`+ // lastAppProps has to be set before ReactDom.render to account for ReactDom throwing an error.`
	`81`	`+ lastAppProps = appProps`
	`82`	`+`
`80`	`83`	`ReactDOM.render(createElement(App, appProps), container)`
`81`	`84`
`82`	`85`	`if (emitter) {`
`83`	`86`	`emitter.emit('after-reactdom-render', { Component })`
`84`	`87`	`}`
`85`		`-`
`86`		`- lastAppProps = appProps`
`87`	`88`	`}`