From 13a4e71a83b2b20403f364d606adbba9d353e447 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 11 Jun 2017 18:47:36 +0430
Subject: [PATCH] refactor into components

---
 lib/server.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index a6f10a300b..f011a34dc2 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -11,14 +11,14 @@ class Server {
     this.app = connect()
     this.server = http.createServer(this.app)
     this.nuxt.ready()
-    .then(() => {
-      // Add Middleware
-      this.nuxt.options.serverMiddleware.forEach(m => {
-        this.useMiddleware(m)
+      .then(() => {
+        // Add Middleware
+        this.options.serverMiddleware.forEach(m => {
+          this.useMiddleware(m)
+        })
+        // Add default render middleware
+        this.useMiddleware(this.render.bind(this))
       })
-      // Add default render middleware
-      this.useMiddleware(this.render.bind(this))
-    })
     return this
   }