Skip to content

Commit e710df5

Browse files
committed
upgrade dependencies
1 parent 206eb6f commit e710df5

File tree

4 files changed

+1361
-1084
lines changed

4 files changed

+1361
-1084
lines changed

src/client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import ReactDOM from 'react-dom';
88
import { ConnectedRouter } from 'react-router-redux';
99
import { renderRoutes } from 'react-router-config';
1010
import { trigger } from 'redial';
11-
import createBrowserHistory from 'history/createBrowserHistory';
11+
import { createBrowserHistory } from 'history';
1212
import Loadable from 'react-loadable';
1313
import { AppContainer as HotEnabler } from 'react-hot-loader';
1414
import { getStoredState } from 'redux-persist';

src/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import http from 'http';
1212
import { StaticRouter } from 'react-router';
1313
import { ConnectedRouter } from 'react-router-redux';
1414
import { renderRoutes } from 'react-router-config';
15-
import createMemoryHistory from 'history/createMemoryHistory';
15+
import { createMemoryHistory } from 'history';
1616
import Loadable from 'react-loadable';
1717
import { getBundles } from 'react-loadable/webpack';
1818
import { trigger } from 'redial';

webpack/dev.config.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,17 @@ const webpackConfig = {
5252
},
5353
module: {
5454
rules: [
55+
{
56+
enforce: 'pre',
57+
test: /\.jsx$/,
58+
exclude: /node_modules/,
59+
loader: 'eslint-loader'
60+
},
5561
{
5662
test: /\.jsx?$/,
5763
include: [path.resolve(__dirname, '../src')],
58-
loaders: [
59-
{
60-
loader: 'babel-loader',
61-
options: babelLoaderQuery
62-
},
63-
{
64-
loader: 'eslint-loader',
65-
options: { emitWarning: true }
66-
}
67-
]
64+
loader: 'babel-loader',
65+
options: babelLoaderQuery
6866
},
6967
{
7068
test: /\.json$/,

0 commit comments

Comments
 (0)