improve hot-reloading

lib/router.js

@@ -49,22 +49,14 @@ export default class Router {
     })
   }
 
-  async update (route, data) {
+  update (route, Component) {
-    data.Component = evalScript(data.component).default
+    const data = this.components[route] || {}
-    delete data.component
+    const newData = { ...data, Component }
-    this.components[route] = data
+    this.components[route] = newData
 
     if (route === this.route) {
-      let props
+      this.notify(newData)
-      try {
-        props = await this.getInitialProps(data.Component, {})
-      } catch (err) {
-        if (err.cancelled) return false
-        throw err
-      }
-      this.notify({ ...data, props })
     }
-    return true
   }
 
   back () {

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$/, '')
+}