11 files changed, 29 insertions, 13 deletions

diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index 5659460c6..f333a0060 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -14,7 +14,7 @@ import ms from 'ms';
 import { URL } from 'url';
 import { readJsonSync } from 'fs-extra';
 
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import { ApiInterface } from 'src/api';
 import { Actions } from 'src/actions/lib/actions';
 import TypedStore from './lib/TypedStore';
diff --git a/src/stores/GlobalErrorStore.ts b/src/stores/GlobalErrorStore.ts
index cb364574b..fcc1276c8 100644
--- a/src/stores/GlobalErrorStore.ts
+++ b/src/stores/GlobalErrorStore.ts
@@ -1,7 +1,7 @@
 import { observable, action } from 'mobx';
 import { Actions } from 'src/actions/lib/actions';
 import { ApiInterface } from 'src/api';
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import Request from './lib/Request';
 import TypedStore from './lib/TypedStore';
 
diff --git a/src/stores/RecipePreviewsStore.ts b/src/stores/RecipePreviewsStore.ts
index 500f69b40..099867785 100644
--- a/src/stores/RecipePreviewsStore.ts
+++ b/src/stores/RecipePreviewsStore.ts
@@ -2,7 +2,7 @@ import { action, computed, observable } from 'mobx';
 import { Actions } from 'src/actions/lib/actions';
 import { ApiInterface } from 'src/api';
 import Recipe from 'src/models/Recipe';
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
diff --git a/src/stores/RecipesStore.ts b/src/stores/RecipesStore.ts
index af2aa7fb0..d63e46bef 100644
--- a/src/stores/RecipesStore.ts
+++ b/src/stores/RecipesStore.ts
@@ -2,7 +2,7 @@ import { action, computed, observable } from 'mobx';
 import { readJSONSync } from 'fs-extra';
 import semver from 'semver';
 
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import { ApiInterface } from 'src/api';
 import { Actions } from 'src/actions/lib/actions';
 import Recipe from 'src/models/Recipe';
diff --git a/src/stores/RequestStore.ts b/src/stores/RequestStore.ts
index 03ad2c7db..af686388a 100644
--- a/src/stores/RequestStore.ts
+++ b/src/stores/RequestStore.ts
@@ -4,7 +4,7 @@ import ms from 'ms';
 
 import { Actions } from 'src/actions/lib/actions';
 import { ApiInterface } from 'src/api';
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import CachedRequest from './lib/CachedRequest';
 import { LOCAL_PORT } from '../config';
 
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index caa44146f..0164d092a 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -5,7 +5,7 @@ import ms from 'ms';
 import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra';
 import { join } from 'path';
 
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import { ApiInterface } from 'src/api';
 import { Actions } from 'src/actions/lib/actions';
 import Request from './lib/Request';
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index 524f2e50c..dabd7b099 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -2,7 +2,7 @@ import { ipcRenderer } from 'electron';
 import { getCurrentWindow } from '@electron/remote';
 import { action, computed, observable, reaction } from 'mobx';
 import localStorage from 'mobx-localstorage';
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import { ApiInterface } from 'src/api';
 import { Actions } from 'src/actions/lib/actions';
 import {
diff --git a/src/stores/UIStore.ts b/src/stores/UIStore.ts
index 306b14cb1..e9e099ebc 100644
--- a/src/stores/UIStore.ts
+++ b/src/stores/UIStore.ts
@@ -1,7 +1,7 @@
 import { action, observable, computed, reaction } from 'mobx';
 import { nativeTheme } from '@electron/remote';
 
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import { ApiInterface } from 'src/api';
 import { Actions } from 'src/actions/lib/actions';
 import { Theme, theme, ThemeType } from '../themes';
diff --git a/src/stores/UserStore.ts b/src/stores/UserStore.ts
index 616ff29a6..0827f8196 100644
--- a/src/stores/UserStore.ts
+++ b/src/stores/UserStore.ts
@@ -6,7 +6,7 @@ import { ipcRenderer } from 'electron';
 
 import { ApiInterface } from 'src/api';
 import { Actions } from 'src/actions/lib/actions';
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import { TODOS_PARTITION_ID } from '../config';
 import { isDevMode } from '../environment-remote';
 import Request from './lib/Request';
diff --git a/src/stores/index.ts b/src/stores/index.ts
index a5b1a7452..aac501cda 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -1,4 +1,3 @@
-import { Stores } from 'src/stores.types';
 import { RouterStore } from 'mobx-react-router';
 import { ApiInterface } from 'src/api';
 import { Actions } from 'src/actions/lib/actions';
@@ -16,12 +15,29 @@ import { workspaceStore } from '../features/workspaces';
 import { communityRecipesStore } from '../features/communityRecipes';
 import { todosStore } from '../features/todos';
 
+export interface RealStores {
+  router: RouterStore;
+  app: AppStore;
+  user: UserStore;
+  features: FeaturesStore;
+  settings: SettingsStore;
+  services: ServicesStore;
+  recipes: RecipesStore;
+  recipePreviews: RecipePreviewsStore;
+  ui: UIStore;
+  requests: RequestStore;
+  globalError: GlobalErrorStore;
+  workspaces: typeof workspaceStore;
+  communityRecipes: typeof communityRecipesStore;
+  todos: typeof todosStore;
+}
+
 export default (
   api: ApiInterface,
   actions: Actions,
   router: RouterStore,
-): Stores => {
-  const stores: Stores | any = {};
+): RealStores => {
+  const stores: RealStores | any = {};
   Object.assign(stores, {
     router,
     app: new AppStore(stores, api, actions),
diff --git a/src/stores/lib/TypedStore.ts b/src/stores/lib/TypedStore.ts
index 7f9d2d60f..c78f83850 100644
--- a/src/stores/lib/TypedStore.ts
+++ b/src/stores/lib/TypedStore.ts
@@ -1,7 +1,7 @@
 import { computed, IReactionPublic, observable } from 'mobx';
 import { Actions } from 'src/actions/lib/actions';
 import { ApiInterface } from 'src/api';
-import { Stores } from 'src/stores.types';
+import { Stores } from 'src/@types/stores.types';
 import Reaction from './Reaction';
 
 export default abstract class TypedStore {