Skip to content
This repository was archived by the owner on Dec 9, 2021. It is now read-only.

Commit 7c5768c

Browse files
committed
Merge branch 'typescript' into feature/typescript-code-splitting
# Conflicts: # src/services/ProviderService.ts
2 parents ee09122 + 7d85fb2 commit 7c5768c

File tree

16 files changed

+8
-8
lines changed

16 files changed

+8
-8
lines changed

src/server/controllers/ReactController.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as React from 'react';
88
import * as Hapi from 'hapi';
99
import RouterWrapper from '../../RouterWrapper';
1010
import ProviderService from '../../services/ProviderService';
11-
import rootSaga from '../../store/rootSaga';
11+
import rootSaga from '../../stores/rootSaga';
1212
import ISagaStore from '../../interfaces/store/ISagaStore';
1313
import IStore from '../../interfaces/store/IStore';
1414
import IController from '../../interfaces/server/IController';

src/services/ProviderService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {createStore, applyMiddleware} from 'redux';
2-
import rootReducer from '../store/rootReducer';
2+
import rootReducer from '../stores/rootReducer';
33
import {composeWithDevTools} from 'redux-devtools-extension/developmentOnly';
44
import createSagaMiddleware, {END, SagaMiddleware} from 'redux-saga';
5-
import rootSaga from '../store/rootSaga';
5+
import rootSaga from '../stores/rootSaga';
66
import IStore from '../interfaces/store/IStore';
77
import ISagaStore from '../interfaces/store/ISagaStore';
88

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)