Skip to content

Commit f5ed4ec

Browse files
authored
Merge pull request #3 from dfiedlerx/feat/remove_persist
feat: 🎸 remove persist
2 parents c1943d4 + 9c2bb2b commit f5ed4ec

File tree

26 files changed

+158
-381
lines changed

26 files changed

+158
-381
lines changed

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
. "$(dirname -- "$0")/_/husky.sh"
33

44
npx --no-install commitlint --edit $1
5+
npm run lint:fix
56
npx lint-staged

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Routes
2828
npx generate-react-cli component page-generated --type=route
2929
Screens
3030
npx generate-react-cli component page-generated --type=screen
31+
Services
32+
npx generate-react-cli component service-generated --type=service
3133

3234
## Learn More
3335

commitlint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
extends: ['@commitlint/config-conventional']
2+
extends: ['@commitlint/config-conventional'],
33
}

package-lock.json

Lines changed: 12 additions & 105 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"test": "jest --forceExit --coverage --no-cache --detectOpenHandles --passWithNoTests",
1010
"test:dev": "jest --watch --forceExit --coverage --no-cache --detectOpenHandles --passWithNoTests",
1111
"lint": "next lint",
12+
"lint:fix": "eslint --fix --ext .js,.jsx,.tsx,.ts .",
1213
"prepare": "husky install"
1314
},
1415
"dependencies": {
@@ -22,7 +23,6 @@
2223
"react-dom": "18.2.0",
2324
"react-icons": "^4.10.1",
2425
"react-redux": "^8.1.2",
25-
"redux-persist": "^6.0.0",
2626
"tailwind-variants": "^0.1.13",
2727
"tailwindcss": "3.3.3"
2828
},
@@ -35,25 +35,24 @@
3535
"@testing-library/jest-dom": "^5.17.0",
3636
"@testing-library/react": "^14.0.0",
3737
"@testing-library/user-event": "^14.4.3",
38-
"@types/node": "20.4.5",
38+
"@types/node": "20.4.6",
3939
"@types/react": "18.2.18",
4040
"@types/react-dom": "18.2.7",
41-
"@types/whatwg-fetch": "^0.0.33",
4241
"@typescript-eslint/eslint-plugin": "^6.2.1",
4342
"@typescript-eslint/parser": "^6.2.1",
4443
"babel-loader": "^9.1.3",
4544
"commitlint": "^17.6.7",
4645
"eslint": "^8.46.0",
4746
"eslint-config-next": "13.4.12",
48-
"eslint-config-prettier": "^8.9.0",
47+
"eslint-config-prettier": "^8.10.0",
4948
"eslint-plugin-prettier": "^5.0.0",
5049
"eslint-plugin-simple-import-sort": "^10.0.0",
5150
"husky": "^8.0.3",
5251
"jest": "^29.6.2",
5352
"jest-environment-jsdom": "^29.6.2",
5453
"jest-fetch-mock": "^3.0.3",
5554
"lint-staged": "^13.2.3",
56-
"prettier": "^3.0.0",
55+
"prettier": "^3.0.1",
5756
"typescript": "5.1.6",
5857
"web-vitals": "^3.4.0",
5958
"webpack": "^5.88.2"

src/app/(redux)/redux-example/page.test.tsx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
import userEvent from '@testing-library/user-event'
22

33
import Page from '@/app/(redux)/redux-example/page'
4+
import useRouterMock, { pushMock } from '@/mocks/useRouter.mock'
45
import { resetStore } from '@/redux/store/store'
56
import { render, screen, waitFor } from '@/utils/test-utils'
67

8+
jest.mock('next/navigation', () => ({
9+
useRouter() {
10+
return useRouterMock
11+
},
12+
}))
13+
714
describe('@/app/(redux)/redux-example/page', () => {
815
beforeEach(() => {
916
resetStore()
@@ -55,4 +62,16 @@ describe('@/app/(redux)/redux-example/page', () => {
5562
expect(screen.getByText('0')).toBeInTheDocument()
5663
})
5764
})
65+
66+
it('should redirect when clicked', async () => {
67+
render(<Page />)
68+
expect(screen.getByText(0)).toBeInTheDocument()
69+
70+
const decrement = screen.getByText('redirect')
71+
await userEvent.click(decrement)
72+
73+
await waitFor(() => {
74+
expect(pushMock).toHaveBeenCalledWith('/redux-persist-example')
75+
})
76+
})
5877
})

src/app/(redux)/redux-example/page.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use client'
22

33
import { ReactElement } from 'react'
4+
import { useRouter } from 'next/navigation'
45

56
import Lazy from '@/components/Lazy/Lazy.lazy'
67
import {
@@ -14,16 +15,27 @@ import useAppSelector from '@/redux/selectors/useAppSelector/useAppSelector'
1415
export default function Page(): ReactElement {
1516
const count = useAppSelector((state) => state.counterReducer.value)
1617
const dispatch = useAppDispatch()
18+
const { push } = useRouter()
1719

1820
return (
1921
<main style={{ maxWidth: 1200, marginInline: 'auto', padding: 20 }}>
2022
<div style={{ marginBottom: '4rem', textAlign: 'center' }}>
23+
<h1>STATE REDUX</h1>
2124
<h4 style={{ marginBottom: 16 }}>{count}</h4>
2225
<button onClick={() => dispatch(increment())}>increment</button>
2326
<button onClick={() => dispatch(decrement())} style={{ marginInline: 16 }}>
2427
decrement
2528
</button>
26-
<button onClick={() => dispatch(reset())}>reset</button>
29+
<button onClick={() => dispatch(reset())} style={{ marginInline: 16 }}>
30+
reset
31+
</button>
32+
<button
33+
onClick={() => {
34+
push('/redux-persist-example')
35+
}}
36+
>
37+
redirect
38+
</button>
2739
{parseInt(count) === 1 && <Lazy />}
2840
</div>
2941
</main>

0 commit comments

Comments
 (0)