diff --git a/lib/app/store.js b/lib/app/store.js index 9b28f8e47c..2b93e69600 100644 --- a/lib/app/store.js +++ b/lib/app/store.js @@ -45,6 +45,9 @@ if (typeof storeData !== 'function') { let module = getModuleNamespace(storeData, namePath) name = namePath.pop() + + //use Object.assign to deal with cases where there's a 'myModule.js' and + //a 'myModule' folder containing state/getters/actions/mutations module[name] = module[name] || {} module[name] = Object.assign(module[name], getModule(filename)) module[name].namespaced = true