Quarke · osbornecharles · Oct 25, 2017
diff --git a/.nuxt/client.js b/.nuxt/client.js
@@ -26,7 +26,6 @@ let store
 
 // Try to rehydrate SSR data from window
 const NUXT = window.__NUXT__ || {}
-NUXT.components = window.__COMPONENTS__ || null
 
 
 // Setup global Vue error handler
@@ -132,30 +131,31 @@ async function loadAsyncComponents (to, from, next) {
   }
 }
 
+function applySSRData(Component, ssrData) {
+  if (NUXT.serverRendered && ssrData) {
+    applyAsyncData(Component, ssrData)
+  }
+  Component._Ctor = Component
+  return Component
+}
+
 // Get matched components
 function resolveComponents(router) {
   const path = getLocation(router.options.base, router.options.mode)
 
   return flatMapComponents(router.match(path), (Component, _, match, key, index) => {
     // If component already resolved
     if (typeof Component !== 'function' || Component.options) {
-      const _Component = sanitizeComponent(Component)
+      const _Component = applySSRData(sanitizeComponent(Component), NUXT.data ? NUXT.data[index] : null)
       match.components[key] = _Component
       return _Component
     }
 
     // Resolve component
     return Component().then(Component => {
-        const _Component = sanitizeComponent(Component)
-        if (NUXT.serverRendered) {
-          applyAsyncData(_Component, NUXT.data[index])
-          if (NUXT.components) {
-            Component.options.components = Object.assign(_Component.options.components, NUXT.components[index])
-          }
-          _Component._Ctor = _Component
-        }
-        match.components[key] = _Component
-        return _Component
+      const _Component = applySSRData(sanitizeComponent(Component), NUXT.data ? NUXT.data[index] : null)
+      match.components[key] = _Component
+      return _Component
     })
   })
 }

diff --git a/.nuxt/dist/LICENSES b/.nuxt/dist/LICENSES
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.4.2
+ * Vue.js v2.4.4
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -13,7 +13,7 @@
  */
 
 /**
- * vuex v2.4.0
+ * vuex v2.4.1
  * (c) 2017 Evan You
  * @license MIT
  */

diff --git a/.nuxt/dist/app.093a34c6b95b5978a7df.js b/.nuxt/dist/app.093a34c6b95b5978a7df.js
diff --git a/.nuxt/dist/app.093a34c6b95b5978a7df.js.map b/.nuxt/dist/app.093a34c6b95b5978a7df.js.map
diff --git a/.nuxt/dist/common.5cdc38cbc7fd5f8fa79b1bfca12cc2d9.css b/.nuxt/dist/common.5cdc38cbc7fd5f8fa79b1bfca12cc2d9.css
diff --git a/.nuxt/dist/common.5cdc38cbc7fd5f8fa79b1bfca12cc2d9.css.map b/.nuxt/dist/common.5cdc38cbc7fd5f8fa79b1bfca12cc2d9.css.map
diff --git a/.nuxt/dist/common.a78e8bc4095f7c80e43a.js b/.nuxt/dist/common.a78e8bc4095f7c80e43a.js
diff --git a/.nuxt/dist/common.a78e8bc4095f7c80e43a.js.map b/.nuxt/dist/common.a78e8bc4095f7c80e43a.js.map
diff --git a/.nuxt/dist/index.spa.html b/.nuxt/dist/index.spa.html
@@ -2,8 +2,8 @@
 <html {{ HTML_ATTRS }}>
   <head>
     {{ HEAD }}
-  <link href="/_nuxt/common.5cdc38cbc7fd5f8fa79b1bfca12cc2d9.css" rel="stylesheet"></head>
+  <link href="/_nuxt/common.851e1660e81e315fb506bd13bc4b6184.css" rel="stylesheet"></head>
   <body {{ BODY_ATTRS }}>
     {{ APP }}
-  <script type="text/javascript" src="/_nuxt/manifest.5950a10485dde51459ed.js"></script><script type="text/javascript" src="/_nuxt/common.a78e8bc4095f7c80e43a.js"></script><script type="text/javascript" src="/_nuxt/app.093a34c6b95b5978a7df.js"></script></body>
+  <script type="text/javascript" src="/_nuxt/manifest.b2337a1401ff18b95e96.js"></script><script type="text/javascript" src="/_nuxt/common.e596f4328e5c31111e8a.js"></script><script type="text/javascript" src="/_nuxt/app.7fb79d2ff8237cf59452.js"></script></body>
 </html>
diff --git a/.nuxt/dist/layouts/default.654a4e778c2d7813009e.js b/.nuxt/dist/layouts/default.654a4e778c2d7813009e.js
diff --git a/.nuxt/dist/layouts/default.654a4e778c2d7813009e.js.map b/.nuxt/dist/layouts/default.654a4e778c2d7813009e.js.map
diff --git a/.nuxt/dist/manifest.5950a10485dde51459ed.js b/.nuxt/dist/manifest.5950a10485dde51459ed.js