File tree Expand file tree Collapse file tree 4 files changed +1361
-1084
lines changed Expand file tree Collapse file tree 4 files changed +1361
-1084
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ import ReactDOM from 'react-dom';
88import { ConnectedRouter } from 'react-router-redux' ;
99import { renderRoutes } from 'react-router-config' ;
1010import { trigger } from 'redial' ;
11- import createBrowserHistory from 'history/createBrowserHistory ' ;
11+ import { createBrowserHistory } from 'history' ;
1212import Loadable from 'react-loadable' ;
1313import { AppContainer as HotEnabler } from 'react-hot-loader' ;
1414import { getStoredState } from 'redux-persist' ;
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ import http from 'http';
1212import { StaticRouter } from 'react-router' ;
1313import { ConnectedRouter } from 'react-router-redux' ;
1414import { renderRoutes } from 'react-router-config' ;
15- import createMemoryHistory from 'history/createMemoryHistory ' ;
15+ import { createMemoryHistory } from 'history' ;
1616import Loadable from 'react-loadable' ;
1717import { getBundles } from 'react-loadable/webpack' ;
1818import { trigger } from 'redial' ;
Original file line number Diff line number Diff line change @@ -52,19 +52,17 @@ const webpackConfig = {
5252 } ,
5353 module : {
5454 rules : [
55+ {
56+ enforce : 'pre' ,
57+ test : / \. j s x $ / ,
58+ exclude : / n o d e _ m o d u l e s / ,
59+ loader : 'eslint-loader'
60+ } ,
5561 {
5662 test : / \. j s x ? $ / ,
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 : / \. j s o n $ / ,
You can’t perform that action at this time.
0 commit comments