Store state should always be a method now

examples/hello-world/nuxt.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-    generate: {
-        minify: false
-    }
-}

examples/vuex-store-modules/store/articles.js

@@ -1,10 +1,10 @@
-export const state = {
+export const state = () => ({
   list: [
     'Lorem ipsum',
     'dolor sit amet',
     'consetetur sadipscing elitr'
   ]
-}
+})
 
 export const mutations = {
   add (state, title) {

examples/vuex-store-modules/store/articles/comments.js

@@ -1,10 +1,10 @@
-export const state = {
+export const state = () => ({
   list: [
     'Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.',
     'Lorem ipsum dolor sit amet, consetetur sadipscing elit.',
     'Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.'
   ]
-}
+})
 
 export const mutations = {
   add (state, title) {

examples/vuex-store-modules/store/index.js

@@ -1,4 +1,6 @@
-export const state = { counter: 0 }
+export const state = () => ({
+  counter: 0
+})
 
 export const mutations = {
   increment (state) {

examples/vuex-store-modules/store/todos.js

@@ -1,6 +1,6 @@
-export const state = {
+export const state = () => ({
   list: []
-}
+})
 
 export const mutations = {
   add (state, { text }) {

lib/app/store.js

@@ -13,7 +13,7 @@ let storeData = {}
 // Check if store/index.js exists
 const indexFilename = filenames.find((filename) => filename.includes('./index.'))
 if (indexFilename) {
-  storeData = getModule(indexFilename, true)
+  storeData = getModule(indexFilename)
 }
 
 // If store is not an exported method = modules store
@@ -41,19 +41,19 @@ if (typeof storeData !== 'function') {
 // createStore
 export const createStore = storeData instanceof Function ? storeData : () => {
   return new Vuex.Store(Object.assign({}, storeData, {
-    // state: storeData.state instanceof Function ? storeData.state() : {}
+    state: storeData.state instanceof Function ? storeData.state() : {}
   }))
 }
 
 // Dynamically require module
-function getModule (filename, root) {
+function getModule (filename) {
   const file = files(filename)
   const module = file.default || file
-  // if (root && module.state && typeof module.state !== 'function') {
-  //   throw new Error('[nuxt] root store state should be a function.')
-  // }
   if (module.commit) {
-    throw new Error('[nuxt] store should export raw store options instead of an instance.')
+    throw new Error('[nuxt] store/' + filename.replace('./', '') + ' should export a method which returns a Vuex instance.')
+  }
+  if (module.state && typeof module.state !== 'function') {
+    throw new Error('[nuxt] state should be a function in store/' + filename.replace('./', ''))
   }
   return module
 }

test/fixtures/basic/store/foo/bar.js

@@ -1,8 +1,6 @@
-export const state = () => {
+export const state = () => ({
-  return {
+  baz: 'Vuex Nested Modules'
-    baz: 'Vuex Nested Modules'
+})
-  }
-}
 
 export const getters = {
   baz (state) {

test/fixtures/basic/store/index.js

@@ -3,11 +3,9 @@ import Vuex from 'vuex'
 
 Vue.use(Vuex)
 
-export const state = () => {
+export const state = () => ({
-  return {
+  counter: 1
-    counter: 1
+})
-  }
-}
 
 export const mutations = {
   increment (state) {