Skip to content

Commit d5c7a6f

Browse files
committed
Simplify index.js (#1666)
1 parent b6a6bb0 commit d5c7a6f

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

src/index.js

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,14 @@ import React from 'react'
44
import ReactDOM from 'react-dom'
55

66
import { initSentry } from './utils/sentry'
7-
import { Provider } from 'react-redux'
8-
import { LocalizeProvider } from 'react-localize-redux';
9-
import { PersistGate } from 'redux-persist/integration/react'
10-
117
import Routing from './components/Routing'
12-
import { store, persistor, history } from './redux/store'
8+
import StoreConfiguration from './redux/store'
139

1410
initSentry();
1511

1612
ReactDOM.render(
17-
<Provider store={store}>
18-
<PersistGate loading={null} persistor={persistor}>
19-
<LocalizeProvider store={store}>
20-
<Routing history={history} />
21-
</LocalizeProvider>
22-
</PersistGate>
23-
</Provider>,
13+
<StoreConfiguration>
14+
<Routing history={history} />
15+
</StoreConfiguration>,
2416
document.getElementById('root')
2517
)

src/redux/store.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
import React from 'react'
12
import { createStore } from 'redux'
23
import { persistStore, persistReducer } from 'redux-persist'
34
import storage from 'redux-persist/lib/storage'
45
import { createBrowserHistory } from 'history'
56

7+
import { Provider } from 'react-redux'
8+
import { LocalizeProvider } from 'react-localize-redux';
9+
import { PersistGate } from 'redux-persist/integration/react'
10+
611
import createRootReducer from '../reducers'
712
import createMiddleware from '../middleware'
813

@@ -11,10 +16,20 @@ const persistConfig = {
1116
storage,
1217
}
1318

14-
export const history = createBrowserHistory()
19+
const history = createBrowserHistory()
1520

1621
const persistedReducer = persistReducer(persistConfig, createRootReducer(history))
1722

1823
export const store = createStore(persistedReducer, createMiddleware(history))
1924

20-
export let persistor = persistStore(store)
25+
let persistor = persistStore(store)
26+
27+
export default ({ children }) => (
28+
<Provider store={store}>
29+
<PersistGate loading={null} persistor={persistor}>
30+
<LocalizeProvider store={store}>
31+
{children}
32+
</LocalizeProvider>
33+
</PersistGate>
34+
</Provider>
35+
)

0 commit comments

Comments
 (0)