Unverified Commit cc4b0c7b authored by TodorTotev's avatar TodorTotev Committed by GitHub

Refactor with redux saga (#13342)

Related to [11014](https://github.com/zeit/next.js/issues/11014)

Upgraded all the packages from package.json, removed the saga-wrapper package since it is totally outdated to today's use.

I have refactored the whole example using the new API of the next-redux-wrapper package, using their new support of "getStaticProps".

All of the class components were converted to functional, using the new redux hooks API.

If you want me to change anything or you are not satisfied with any given change, I'm open to suggestions.
parent 0dd818b7
...@@ -7,6 +7,7 @@ export const actionTypes = { ...@@ -7,6 +7,7 @@ export const actionTypes = {
LOAD_DATA_SUCCESS: 'LOAD_DATA_SUCCESS', LOAD_DATA_SUCCESS: 'LOAD_DATA_SUCCESS',
START_CLOCK: 'START_CLOCK', START_CLOCK: 'START_CLOCK',
TICK_CLOCK: 'TICK_CLOCK', TICK_CLOCK: 'TICK_CLOCK',
HYDRATE: 'HYDRATE',
} }
export function failure(error) { export function failure(error) {
......
import { Component } from 'react' import { useSelector, useDispatch } from 'react-redux'
import { connect } from 'react-redux'
import { increment, decrement, reset } from '../actions' import { increment, decrement, reset } from '../actions'
class Counter extends Component { const Counter = () => {
increment = () => { const count = useSelector((state) => state.count)
this.props.dispatch(increment()) const dispatch = useDispatch()
}
decrement = () => { return (
this.props.dispatch(decrement()) <div>
} <style jsx>{`
div {
reset = () => { padding: 0 0 20px 0;
this.props.dispatch(reset()) }
} `}</style>
<h1>
render() { Count: <span>{count}</span>
const { count } = this.props </h1>
return ( <button onClick={() => dispatch(increment())}>+1</button>
<div> <button onClick={() => dispatch(decrement())}>-1</button>
<style jsx>{` <button onClick={() => dispatch(reset())}>Reset</button>
div { </div>
padding: 0 0 20px 0; )
}
`}</style>
<h1>
Count: <span>{count}</span>
</h1>
<button onClick={this.increment}>+1</button>
<button onClick={this.decrement}>-1</button>
<button onClick={this.reset}>Reset</button>
</div>
)
}
} }
const mapStateToProps = ({ count }) => ({ count }) export default Counter
export default connect(mapStateToProps)(Counter)
import Link from 'next/link' import Link from 'next/link'
import { connect } from 'react-redux' import { useSelector } from 'react-redux'
import Counter from './counter' import Counter from './counter'
import Clock from './clock' import Clock from './clock'
function Page({ function Page({ linkTo, NavigateTo, title }) {
error, const placeholderData = useSelector((state) => state.placeholderData)
lastUpdate, const error = useSelector((state) => state.error)
light, const light = useSelector((state) => state.light)
linkTo, const lastUpdate = useSelector((state) => state.lastUpdate)
NavigateTo,
placeholderData,
title,
}) {
return ( return (
<div> <div>
<h1>{title}</h1> <h1>{title}</h1>
...@@ -33,4 +29,4 @@ function Page({ ...@@ -33,4 +29,4 @@ function Page({
) )
} }
export default connect((state) => state)(Page) export default Page
...@@ -10,13 +10,12 @@ ...@@ -10,13 +10,12 @@
"dependencies": { "dependencies": {
"es6-promise": "4.1.1", "es6-promise": "4.1.1",
"next": "latest", "next": "latest",
"next-redux-saga": "4.0.0", "next-redux-wrapper": "6.0.0",
"next-redux-wrapper": "2.0.0", "react": "16.13.1",
"react": "^16.0.0", "react-dom": "16.13.1",
"react-dom": "^16.0.0", "react-redux": "7.2.0",
"react-redux": "5.0.7", "redux": "4.0.5",
"redux": "4.0.1", "redux-saga": "1.1.3"
"redux-saga": "1.0.1"
}, },
"devDependencies": { "devDependencies": {
"redux-devtools-extension": "2.13.2" "redux-devtools-extension": "2.13.2"
......
import App from 'next/app' import App from 'next/app'
import { Provider } from 'react-redux' import { END } from 'redux-saga'
import withRedux from 'next-redux-wrapper' import { wrapper } from '../store'
import withReduxSaga from 'next-redux-saga'
import createStore from '../store'
class MyApp extends App { class MyApp extends App {
static async getInitialProps({ Component, ctx }) { static async getInitialProps({ Component, ctx }) {
let pageProps = {} const pageProps = {
...(Component.getInitialProps
? await Component.getInitialProps(ctx)
: {}),
}
if (Component.getInitialProps) { if (ctx.req) {
pageProps = await Component.getInitialProps({ ctx }) ctx.store.dispatch(END)
await ctx.store.sagaTask.toPromise()
} }
return { pageProps } return { pageProps }
} }
render() { render() {
const { Component, pageProps, store } = this.props const { Component, pageProps } = this.props
return ( return <Component {...pageProps} />
<Provider store={store}>
<Component {...pageProps} />
</Provider>
)
} }
} }
export default withRedux(createStore)(withReduxSaga(MyApp)) export default wrapper.withRedux(MyApp)
import { Component } from 'react' import { useEffect } from 'react'
import { connect } from 'react-redux' import { useDispatch } from 'react-redux'
import { END } from 'redux-saga'
import { wrapper } from '../store'
import { loadData, startClock, tickClock } from '../actions' import { loadData, startClock, tickClock } from '../actions'
import Page from '../components/page' import Page from '../components/page'
class Index extends Component { const Index = () => {
static async getInitialProps(props) { const dispatch = useDispatch()
const { store, isServer } = props.ctx
store.dispatch(tickClock(isServer))
if (!store.getState().placeholderData) {
store.dispatch(loadData())
}
return { isServer } useEffect(() => {
} dispatch(startClock())
}, [dispatch])
return (
<>
<Page title="Index Page" linkTo="/other" NavigateTo="Other Page" />
</>
)
}
componentDidMount() { export const getStaticProps = wrapper.getStaticProps(async ({ store }) => {
this.props.dispatch(startClock()) store.dispatch(tickClock(false))
}
render() { if (!store.getState().placeholderData) {
return <Page title="Index Page" linkTo="/other" NavigateTo="Other Page" /> store.dispatch(loadData())
store.dispatch(END)
} }
} await store.sagaTask.toPromise()
})
export default connect()(Index) export default Index
import { Component } from 'react' import { useEffect } from 'react'
import { connect } from 'react-redux' import { useDispatch } from 'react-redux'
import { wrapper } from '../store'
import { startClock, tickClock } from '../actions' import { startClock, tickClock } from '../actions'
import Page from '../components/page' import Page from '../components/page'
class Other extends Component { const Other = () => {
static async getInitialProps(props) { const dispatch = useDispatch()
const { store, isServer } = props.ctx useEffect(() => {
store.dispatch(tickClock(isServer)) dispatch(startClock())
return { isServer } }, [dispatch])
}
componentDidMount() {
this.props.dispatch(startClock())
}
render() { return <Page title="Other Page" linkTo="/" NavigateTo="Index Page" />
return <Page title="Other Page" linkTo="/" NavigateTo="Index Page" />
}
} }
export default connect()(Other) export const getStaticProps = wrapper.getStaticProps(async ({ store }) => {
store.dispatch(tickClock(false))
})
export default Other
...@@ -10,6 +10,10 @@ export const exampleInitialState = { ...@@ -10,6 +10,10 @@ export const exampleInitialState = {
function reducer(state = exampleInitialState, action) { function reducer(state = exampleInitialState, action) {
switch (action.type) { switch (action.type) {
case '__NEXT_REDUX_WRAPPER_HYDRATE__': {
return { ...state, ...action.payload }
}
case actionTypes.FAILURE: case actionTypes.FAILURE:
return { return {
...state, ...state,
......
import { applyMiddleware, createStore } from 'redux' import { applyMiddleware, createStore } from 'redux'
import createSagaMiddleware from 'redux-saga' import createSagaMiddleware from 'redux-saga'
import { createWrapper } from 'next-redux-wrapper'
import rootReducer, { exampleInitialState } from './reducer' import rootReducer, { exampleInitialState } from './reducer'
import rootSaga from './saga' import rootSaga from './saga'
...@@ -12,8 +13,9 @@ const bindMiddleware = (middleware) => { ...@@ -12,8 +13,9 @@ const bindMiddleware = (middleware) => {
return applyMiddleware(...middleware) return applyMiddleware(...middleware)
} }
function configureStore(initialState = exampleInitialState) { export const makeStore = (context, initialState = exampleInitialState) => {
const sagaMiddleware = createSagaMiddleware() const sagaMiddleware = createSagaMiddleware()
const store = createStore( const store = createStore(
rootReducer, rootReducer,
initialState, initialState,
...@@ -25,4 +27,4 @@ function configureStore(initialState = exampleInitialState) { ...@@ -25,4 +27,4 @@ function configureStore(initialState = exampleInitialState) {
return store return store
} }
export default configureStore export const wrapper = createWrapper(makeStore, { debug: true })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment