feat: preserve state with registerModule

Author: blake-newman

src/store.js

@@ -150,7 +150,7 @@ export class Store {
     })
   }
 
-  registerModule (path, rawModule) {
+  registerModule (path, rawModule, options = {}) {
     if (typeof path === 'string') path = [path]
 
     if (process.env.NODE_ENV !== 'production') {
@@ -159,7 +159,7 @@ export class Store {
     }
 
     this._modules.register(path, rawModule)
-    installModule(this, this.state, path, this._modules.get(path))
+    installModule(this, this.state, path, this._modules.get(path), options.preserveState)
     // reset store to update getters...
     resetStoreVM(this, this.state)
   }
@@ -199,7 +199,7 @@ function resetStore (store, hot) {
   store._modulesNamespaceMap = Object.create(null)
   const state = store.state
   // init all modules
-  installModule(store, state, [], store._modules.root, true)
+  installModule(store, state, [], store._modules.root, hot)
   // reset vm
   resetStoreVM(store, state, hot)
 }

test/unit/modules.spec.js

@@ -80,6 +80,28 @@ describe('Modules', () => {
       store.commit('a/foo')
       expect(mutationSpy).toHaveBeenCalled()
     })
+
+    it('dynamic module registration preserving hydration', () => {
+      const store = new Vuex.Store({})
+      store.replaceState({ a: { foo: 'state' } })
+      const actionSpy = jasmine.createSpy()
+      const mutationSpy = jasmine.createSpy()
+      store.registerModule('a', {
+        namespaced: true,
+        getters: { foo: state => state.foo },
+        actions: { foo: actionSpy },
+        mutations: { foo: mutationSpy }
+      }, { preserveState: true })
+
+      expect(store.state.a.foo).toBe('state')
+      expect(store.getters['a/foo']).toBe('state')
+
+      store.dispatch('a/foo')
+      expect(actionSpy).toHaveBeenCalled()
+
+      store.commit('a/foo')
+      expect(mutationSpy).toHaveBeenCalled()
+    })
   })
 
   // #524

types/index.d.ts

@@ -20,8 +20,8 @@ export declare class Store<S> {
   subscribe<P extends Payload>(fn: (mutation: P, state: S) => any): () => void;
   watch<T>(getter: (state: S) => T, cb: (value: T, oldValue: T) => void, options?: WatchOptions): void;
 
-  registerModule<T>(path: string, module: Module<T, S>): void;
-  registerModule<T>(path: string[], module: Module<T, S>): void;
+  registerModule<T>(path: string, module: Module<T, S>, options?: ModuleOptions): void;
+  registerModule<T>(path: string[], module: Module<T, S>, options?: ModuleOptions): void;
 
   unregisterModule(path: string): void;
   unregisterModule(path: string[]): void;
@@ -92,6 +92,10 @@ export interface Module<S, R> {
   modules?: ModuleTree<R>;
 }
 
+export interface ModuleOptions{
+  preserveState?: boolean
+}
+
 export interface GetterTree<S, R> {
   [key: string]: Getter<S, R>;
 }

types/test/index.ts

@@ -199,6 +199,10 @@ namespace RegisterModule {
     state: { value: 2 }
   });
 
+  store.registerModule(["a", "b"], {
+    state: { value: 2 }
+  }, { preserveState: true });
+
   store.unregisterModule(["a", "b"]);
   store.unregisterModule("a");
 }