fix(store): handle case when the root store is a function

logux · Nov 11, 2023 · cf756dd · cf756dd
1 parent 0dc3bec
commit cf756dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/store/index.js b/store/index.js
@@ -433,7 +433,10 @@ function unifyCommitArgs(type, payload = {}, options = {}) {
 }
 
 function collectState(store) {
-  let state = store.state || {}
+  let state =
+    store.state && typeof store.state === 'function'
+      ? store.state()
+      : store.state || {}
   function collectModuleState(module, moduleName, moduleState) {
     if (moduleName) {
       moduleState[moduleName] =

diff --git a/store/index.test.ts b/store/index.test.ts
@@ -1034,7 +1034,7 @@ it('applies old actions from store in nested modules', async () => {
   }
 
   let store2 = _createStore2<Store2State>({
-    state: { value: 0 },
+    state: () => ({ value: 0 }),
     mutations: { historyLine },
     modules: {
       a: {
@@ -1048,7 +1048,7 @@ it('applies old actions from store in nested modules', async () => {
             modules: {
               c: {
                 namespaced: true,
-                state: { value: 0 },
+                state: () => ({ value: 0 }),
                 mutations: { historyLine },
                 modules: {
                   d: {