Merge branch 'typescript' into feature/typescript-code-splitting

rsavian · rsavian · commit 90323403656c · 2017-08-28T12:28:34.000-05:00
# Conflicts:
#	src/RouterWrapper.tsx
diff --git a/src/RouterWrapper.tsx b/src/RouterWrapper.tsx
@@ -8,8 +8,8 @@ import Contact from './views/contact/Contact';
 import FooterAsync from './views/landmarks/FooterAsync';
 import Header from './views/landmarks/Header';
 import NotFoundAsync from './views/errors/NotFoundAsync';
-import IStore from './interfaces/store/IStore';
-import ISagaStore from './interfaces/store/ISagaStore';
+import IStore from './interfaces/stores/IStore';
+import ISagaStore from './interfaces/stores/ISagaStore';
 
 interface IProviderWrapperProps {
     store: ISagaStore<IStore>;
diff --git a/src/client.tsx b/src/client.tsx
@@ -8,8 +8,8 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import RouterWrapper from './RouterWrapper';
 import ProviderService from './services/ProviderService';
-import IStore from './interfaces/store/IStore';
-import ISagaStore from './interfaces/store/ISagaStore';
+import IStore from './interfaces/stores/IStore';
+import ISagaStore from './interfaces/stores/ISagaStore';
 
 const rehydrateState = window.__ASYNC_COMPONENTS_STATE__;
 const initialState: IStore = {
diff --git a/src/interfaces/stores/IAction.ts b/src/interfaces/stores/IAction.ts
diff --git a/src/interfaces/stores/ISagaStore.ts b/src/interfaces/stores/ISagaStore.ts
diff --git a/src/interfaces/stores/IStore.ts b/src/interfaces/stores/IStore.ts
diff --git a/src/interfaces/stores/reducers/ILoadingReducerState.ts b/src/interfaces/stores/reducers/ILoadingReducerState.ts
diff --git a/src/interfaces/stores/reducers/IMetaReducerState.ts b/src/interfaces/stores/reducers/IMetaReducerState.ts
diff --git a/src/interfaces/stores/reducers/IRenderReducerState.ts b/src/interfaces/stores/reducers/IRenderReducerState.ts
diff --git a/src/interfaces/stores/reducers/IUserReducerState.ts b/src/interfaces/stores/reducers/IUserReducerState.ts
diff --git a/src/server/controllers/ReactController.tsx b/src/server/controllers/ReactController.tsx
@@ -9,8 +9,8 @@ import * as Hapi from 'hapi';
 import RouterWrapper from '../../RouterWrapper';
 import ProviderService from '../../services/ProviderService';
 import rootSaga from '../../stores/rootSaga';
-import ISagaStore from '../../interfaces/store/ISagaStore';
-import IStore from '../../interfaces/store/IStore';
+import ISagaStore from '../../interfaces/stores/ISagaStore';
+import IStore from '../../interfaces/stores/IStore';
 import IController from '../../interfaces/server/IController';
 
 class ReactController implements IController {
diff --git a/src/services/ProviderService.ts b/src/services/ProviderService.ts
@@ -3,8 +3,8 @@ import rootReducer from '../stores/rootReducer';
 import {composeWithDevTools} from 'redux-devtools-extension/developmentOnly';
 import createSagaMiddleware, {END, SagaMiddleware} from 'redux-saga';
 import rootSaga from '../stores/rootSaga';
-import IStore from '../interfaces/store/IStore';
-import ISagaStore from '../interfaces/store/ISagaStore';
+import IStore from '../interfaces/stores/IStore';
+import ISagaStore from '../interfaces/stores/ISagaStore';
 
 class ProviderService {
 
diff --git a/src/stores/loading/LoadingAction.ts b/src/stores/loading/LoadingAction.ts
@@ -1,4 +1,4 @@
-import IAction from '../../interfaces/store/IAction';
+import IAction from '../../interfaces/stores/IAction';
 
 class LoadingAction {
 
diff --git a/src/stores/loading/LoadingReducer.ts b/src/stores/loading/LoadingReducer.ts
@@ -1,6 +1,6 @@
 import LoadingAction from './LoadingAction';
-import ILoadingReducerState from '../../interfaces/store/reducers/ILoadingReducerState';
-import IAction from '../../interfaces/store/IAction';
+import ILoadingReducerState from '../../interfaces/stores/reducers/ILoadingReducerState';
+import IAction from '../../interfaces/stores/IAction';
 
 class LoadingReducer {
 
diff --git a/src/stores/meta/MetaAction.ts b/src/stores/meta/MetaAction.ts
@@ -1,5 +1,5 @@
-import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
-import IAction from '../../interfaces/store/IAction';
+import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
+import IAction from '../../interfaces/stores/IAction';
 
 class MetaAction {
 
diff --git a/src/stores/meta/MetaReducer.ts b/src/stores/meta/MetaReducer.ts
@@ -1,6 +1,6 @@
 import MetaAction from './MetaAction';
-import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
-import IAction from '../../interfaces/store/IAction';
+import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
+import IAction from '../../interfaces/stores/IAction';
 
 class MetaReducer {
 
diff --git a/src/stores/render/RenderReducer.ts b/src/stores/render/RenderReducer.ts
@@ -1,5 +1,5 @@
-import IRenderReducerState from '../../interfaces/store/reducers/IRenderReducerState';
-import IAction from '../../interfaces/store/IAction';
+import IRenderReducerState from '../../interfaces/stores/reducers/IRenderReducerState';
+import IAction from '../../interfaces/stores/IAction';
 
 class RenderReducer {
 
diff --git a/src/stores/rootSaga.ts b/src/stores/rootSaga.ts
@@ -1,7 +1,7 @@
 import {all, fork, takeLatest, select, ForkEffect} from 'redux-saga/effects';
 import UserSaga from './user/UserSaga';
 import UserAction from './user/UserAction';
-import IStore from '../interfaces/store/IStore';
+import IStore from '../interfaces/stores/IStore';
 
 export default function* rootSaga() {
     const store: IStore = yield select();
diff --git a/src/stores/user/UserAction.ts b/src/stores/user/UserAction.ts
@@ -1,4 +1,4 @@
-import IAction from '../../interfaces/store/IAction';
+import IAction from '../../interfaces/stores/IAction';
 
 class UserAction {
 
diff --git a/src/stores/user/UserReducer.ts b/src/stores/user/UserReducer.ts
@@ -1,6 +1,6 @@
 import UserAction from './UserAction';
-import IUserReducerState from '../../interfaces/store/reducers/IUserReducerState';
-import IAction from '../../interfaces/store/IAction';
+import IUserReducerState from '../../interfaces/stores/reducers/IUserReducerState';
+import IAction from '../../interfaces/stores/IAction';
 
 class UserReducer {
 
diff --git a/src/stores/user/UserSaga.ts b/src/stores/user/UserSaga.ts
@@ -1,8 +1,8 @@
 import {put} from 'redux-saga/effects';
 import UserAction from './UserAction';
 import LoadingAction from '../loading/LoadingAction';
-import IAction from '../../interfaces/store/IAction';
-import IUserReducerState from '../../interfaces/store/reducers/IUserReducerState';
+import IAction from '../../interfaces/stores/IAction';
+import IUserReducerState from '../../interfaces/stores/reducers/IUserReducerState';
 
 class UserSaga {
 
diff --git a/src/views/about/About.tsx b/src/views/about/About.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import MetaAction from '../../stores/meta/MetaAction';
-import IStore from '../../interfaces/store/IStore';
+import IStore from '../../interfaces/stores/IStore';
 import {Dispatch} from 'redux';
-import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
+import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
 
 interface IStateToProps {}
 
diff --git a/src/views/contact/Contact.tsx b/src/views/contact/Contact.tsx
@@ -2,8 +2,8 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import MetaAction from '../../stores/meta/MetaAction';
 import {Dispatch} from 'redux';
-import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
-import IStore from '../../interfaces/store/IStore';
+import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
+import IStore from '../../interfaces/stores/IStore';
 import ContactForm from './ContactForm';
 
 interface IStateToProps {}
diff --git a/src/views/errors/NotFound.tsx b/src/views/errors/NotFound.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import MetaAction from '../../stores/meta/MetaAction';
-import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
-import IStore from '../../interfaces/store/IStore';
+import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
+import IStore from '../../interfaces/stores/IStore';
 import {Dispatch} from 'redux';
 
 interface IStateToProps {}
diff --git a/src/views/home/Home.tsx b/src/views/home/Home.tsx
@@ -2,10 +2,10 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import UserAction from '../../stores/user/UserAction';
 import MetaAction from '../../stores/meta/MetaAction';
-import IStore from '../../interfaces/store/IStore';
+import IStore from '../../interfaces/stores/IStore';
 import {Dispatch} from 'redux';
-import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
-import IUserReducerState from '../../interfaces/store/reducers/IUserReducerState';
+import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
+import IUserReducerState from '../../interfaces/stores/reducers/IUserReducerState';
 
 interface IStateToProps {
     readonly user: IUserReducerState;
