Skip to content
This repository was archived by the owner on Sep 6, 2022. It is now read-only.

Commit 8a49cd4

Browse files
committed
templates type errors fixed
1 parent 9eb189b commit 8a49cd4

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

app/configureStore.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import { applyMiddleware, createStore } from 'redux';
66
import { routerMiddleware } from 'connected-react-router';
77
import createSagaMiddleware from 'redux-saga';
88
import createReducer from './reducers';
9-
import { InjectedStore } from 'types';
9+
import { InjectedStore, ApplicationRootState } from 'types';
1010
import { History } from 'history';
11-
import { RootState } from './containers/App/types';
1211
import { composeWithDevTools } from 'redux-devtools-extension';
1312

14-
export default function configureStore(initialState: RootState | {} = {}, history: History) {
13+
export default function configureStore(initialState: ApplicationRootState | {} = {}, history: History) {
1514
const reduxSagaMonitorOptions = {};
1615
const sagaMiddleware = createSagaMiddleware(reduxSagaMonitorOptions);
1716

internals/templates/configureStore.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ import { applyMiddleware, createStore } from 'redux';
77
import { routerMiddleware } from 'connected-react-router';
88
import createSagaMiddleware from 'redux-saga';
99
import createReducer from './reducers';
10-
import { InjectedStore } from 'types';
10+
import { InjectedStore, ApplicationRootState } from 'types';
1111
import { History } from 'history';
12-
import { RootState } from '../../app/containers/App/types';
1312

1413

15-
export default function configureStore(initialState: RootState | {} = {}, history: History) {
14+
export default function configureStore(initialState: ApplicationRootState | {} = {}, history: History) {
1615
const reduxSagaMonitorOptions = {};
1716
const sagaMiddleware = createSagaMiddleware(reduxSagaMonitorOptions);
1817

internals/templates/types/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Reducer, Store } from 'redux';
22
import { RouterState } from 'connected-react-router';
33
import { ContainerState as LanguageProviderState } from 'containers/LanguageProvider/types';
44

5-
export interface LifeStore extends Store {
5+
export interface InjectedStore extends Store {
66
injectedReducers: any;
77
injectedSagas: any;
88
runSaga(saga: (() => IterableIterator<any>) | undefined, args: any | undefined): any;

internals/templates/utils/tests/injectSaga.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { getInjectors } from '../sagaInjectors';
1414

1515

1616
import { createMemoryHistory } from 'history';
17-
import { InjectedStore } from '../../../../app/types';
17+
import { InjectedStore } from '../../types';
1818

1919
const memoryHistory = createMemoryHistory();
2020

internals/templates/utils/tests/reducerInjectors.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*/
44

55
import identity from 'lodash/identity';
6-
import history from '../../../../app/utils/history';
6+
import history from '../../utils/history';
77

88
import configureStore from '../../configureStore';
99

1010
import { getInjectors, injectReducerFactory } from '../reducerInjectors';
11-
import { InjectedStore } from '../../../../app/types';
11+
import { InjectedStore } from '../../types';
1212
import { AnyAction, Reducer } from 'redux';
1313

1414
const initialState = { reduced: 'soon' };

internals/templates/utils/tests/sagaInjectors.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
ejectSagaFactory,
1515
} from '../sagaInjectors';
1616
import { DAEMON, ONCE_TILL_UNMOUNT, RESTART_ON_REMOUNT } from '../constants';
17-
import { InjectedStore } from '../../../../app/types';
17+
import { InjectedStore } from '../../types';
1818

1919
function* testSaga() {
2020
yield put({ type: 'TEST', payload: 'yup' });

0 commit comments

Comments
 (0)