improve hot-reloading

nkzawa · nkzawa · commit 3c44137b9b3f · 2016-10-17T23:35:31.000+09:00
diff --git a/lib/router.js b/lib/router.js
@@ -49,22 +49,14 @@ export default class Router {
     })
   }
 
-  async update (route, data) {
-    data.Component = evalScript(data.component).default
-    delete data.component
-    this.components[route] = data
+  update (route, Component) {
+    const data = this.components[route] || {}
+    const newData = { ...data, Component }
+    this.components[route] = newData
 
     if (route === this.route) {
-      let props
-      try {
-        props = await this.getInitialProps(data.Component, {})
-      } catch (err) {
-        if (err.cancelled) return false
-        throw err
-      }
-      this.notify({ ...data, props })
+      this.notify(newData)
     }
-    return true
   }
 
   back () {
diff --git a/server/build/loaders/hot-self-accept-loader.js b/server/build/loaders/hot-self-accept-loader.js
@@ -1,14 +1,23 @@
+import { resolve, relative } from 'path'
 
 module.exports = function (content) {
   this.cacheable()
 
+  const route = getRoute(this)
+
   return content + `
     if (module.hot) {
       module.hot.accept()
       if ('idle' !== module.hot.status()) {
         const Component = module.exports.default || module.exports
-        next.router.notify({ Component })
+        next.router.update('${route}', Component)
       }
     }
   `
 }
+
+function getRoute (loaderContext) {
+  const pagesDir = resolve(loaderContext.options.context, 'pages')
+  const path = loaderContext.resourcePath
+  return '/' + relative(pagesDir, path).replace(/((^|\/)index)?\.js$/, '')
+}

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,23 @@`
	`1`	`+import { resolve, relative } from 'path'`
`1`	`2`
`2`	`3`	`module.exports = function (content) {`
`3`	`4`	`this.cacheable()`
`4`	`5`
	`6`	`+ const route = getRoute(this)`
	`7`	`+`
`5`	`8`	return content + `
`6`	`9`	`if (module.hot) {`
`7`	`10`	`module.hot.accept()`
`8`	`11`	`if ('idle' !== module.hot.status()) {`
`9`	`12`	`const Component = module.exports.default \|\| module.exports`
`10`		`- next.router.notify({ Component })`
	`13`	`+ next.router.update('${route}', Component)`
`11`	`14`	`}`
`12`	`15`	`}`
`13`	`16`	`
`14`	`17`	`}`
	`18`	`+`
	`19`	`+function getRoute (loaderContext) {`
	`20`	`+ const pagesDir = resolve(loaderContext.options.context, 'pages')`
	`21`	`+ const path = loaderContext.resourcePath`
	`22`	`+ return '/' + relative(pagesDir, path).replace(/((^\|\/)index)?\.js$/, '')`
	`23`	`+}`