From 2cdeab56617787cc19b637a92fad36899eb7836b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sat, 13 May 2017 22:02:11 +0430
Subject: [PATCH] [Store] Fix createStore bug

---
 lib/app/store.js | 93 ++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/lib/app/store.js b/lib/app/store.js
index b0679c84af..f9899b0e42 100644
--- a/lib/app/store.js
+++ b/lib/app/store.js
@@ -1,15 +1,56 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+
 Vue.use(Vuex)
 
-let files = require.context('~/store', true, /^\.\/.*\.(js|ts)$/)
-let filenames = files.keys()
+// Recursive find files in ~/store
+const files = require.context('~/store', true, /^\.\/.*\.(js|ts)$/)
+const filenames = files.keys()
 
+// Store
+let storeData = {}
+
+// Check if store/index.js exists
+if (filenames.indexOf('./index.js') !== -1) {
+  storeData = getModule('./index.js')
+  storeData.state = storeData.state() // Vuex Bug!
+}
+
+// Store modules
+if (!storeData.modules) {
+  storeData.modules = {}
+}
+
+for (let filename of filenames) {
+  let name = filename.replace(/^\.\//, '').replace(/\.(js|ts)$/, '')
+  if (name === 'index') continue
+
+  let namePath = name.split(/\//)
+  let module = getModuleNamespace(storeData, namePath)
+
+  name = namePath.pop()
+  module[name] = getModule(filename)
+  module[name].namespaced = true
+}
+
+// createStore
+export const createStore = storeData === 'function' ? storeData : () => new Vuex.Store(storeData)
+
+// Dynamically require module
 function getModule (filename) {
-  let file = files(filename)
-  return file.default
-    ? file.default
-    : file
+  const file = files(filename)
+  const module = Object.assign({}, file.default || file)
+  if (module.state && typeof module.state !== 'function') {
+    // eslint-disable-next-line no-console
+    console.error('[nuxt] store state should be a function.')
+    return
+  }
+  if (module.commit) {
+    // eslint-disable-next-line no-console
+    console.error('[nuxt] store should export raw store options instead of an instance.')
+    return
+  }
+  return module
 }
 
 function getModuleNamespace (storeData, namePath) {
@@ -22,43 +63,3 @@ function getModuleNamespace (storeData, namePath) {
   storeData.modules[namespace].modules = storeData.modules[namespace].modules || {}
   return getModuleNamespace(storeData.modules[namespace], namePath)
 }
-
-let store
-let storeData = {}
-
-// Check if store/index.js returns a vuex store
-if (filenames.indexOf('./index.js') !== -1) {
-  let mainModule = getModule('./index.js')
-  if (mainModule.commit) {
-    console.error('[nuxt.js] store/index should export raw store options instead of an instance.')
-  } else {
-    if (mainModule.state && typeof mainModule.state !== 'function') {
-      console.error('[nuxt.js] store state should be a function.')
-    }
-    storeData = mainModule
-  }
-}
-
-// Generate the store if there is no store yet
-if (store == null) {
-  storeData.modules = storeData.modules || {}
-  for (let filename of filenames) {
-    let name = filename.replace(/^\.\//, '').replace(/\.(js|ts)$/, '')
-    if (name === 'index') continue
-
-    let namePath = name.split(/\//)
-    let module = getModuleNamespace(storeData, namePath)
-
-    name = namePath.pop()
-    module[name] = getModule(filename)
-    module[name].namespaced = true
-
-    if (typeof module[name].state !== 'function') {
-      console.error('[nuxt.js] store module state should be a function.')
-    }
-  }
-}
-
-export function createStore () {
-  return new Vuex.Store(storeData)
-}