feat(type): migrate RootState type

lbwa · Mar 7, 2020 · 933eb34 · 933eb34
1 parent 36e98ba
commit 933eb34
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/store/index.ts b/src/store/index.ts
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
 import createLogger from 'vuex/dist/logger'
 
 import modules from './modules'
-import globalNamespace from './global'
+import globalNamespace, { RootState } from './global'
 import { createResetPlugin } from '../plugins/store'
 
 Vue.use(Vuex)
@@ -16,8 +16,6 @@ const plugins = (() => {
   return plugins
 })()
 
-export type RootState = typeof globalNamespace.state
-
 const store = new Vuex.Store<RootState>(
   Object.assign(globalNamespace, {
     modules,

diff --git a/src/store/modules/history.ts b/src/store/modules/history.ts
@@ -1,7 +1,7 @@
 import { Module } from 'vuex'
 import { Route } from 'vue-router'
 import invariant from 'tiny-invariant'
-import { RootState } from '../index'
+import { RootState } from '../global'
 import { RECORD_MAX_VAL } from '../../constants'
 
 export type RecordItem = {

diff --git a/src/store/modules/index.ts b/src/store/modules/index.ts
@@ -1,5 +1,5 @@
 import { Module } from 'vuex'
-import { RootState } from '..'
+import { RootState } from '../global'
 
 const requireStoreModule = require.context(
   '.',

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { Module } from 'vuex'
-import { RootState } from '..'
+import { RootState } from '../global'
 import { Ability, init, RouteWithAbility, reset } from 'v-access'
 import { userLogin, fetchUserAbilities } from '@/effects'
 import VueRouter from 'vue-router'