From 8689af6480d34d26b0456182c7339a488c9aa7cd Mon Sep 17 00:00:00 2001
From: nkzawa <naoyuki.kanezawa@gmail.com>
Date: Mon, 17 Oct 2016 16:07:41 +0900
Subject: [PATCH] server: tweak

---
 server/index.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/server/index.js b/server/index.js
index 5394231c..ee90f4a1 100644
--- a/server/index.js
+++ b/server/index.js
@@ -20,9 +20,24 @@ export default class Server {
         res.end('error')
       })
     })
+
+    this.defineRoutes()
   }
 
   async start (port) {
+    if (this.hotReloader) {
+      await this.hotReloader.start()
+    }
+
+    await new Promise((resolve, reject) => {
+      this.http.listen(port, (err) => {
+        if (err) return reject(err)
+        resolve()
+      })
+    })
+  }
+
+  defineRoutes () {
     this.router.get('/_next/:path+', async (req, res, params) => {
       const p = resolve(__dirname, '../client', (params.path || []).join('/'))
       await this.serveStatic(req, res, p)
@@ -40,17 +55,6 @@ export default class Server {
     this.router.get('/:path*', async (req, res) => {
       await this.render(req, res)
     })
-
-    if (this.hotReloader) {
-      await this.hotReloader.start()
-    }
-
-    await new Promise((resolve, reject) => {
-      this.http.listen(port, (err) => {
-        if (err) return reject(err)
-        resolve()
-      })
-    })
   }
 
   async run (req, res) {