Skip to content

Commit 07041f1

Browse files
authored
Merge branch 'main' into react-18-upgrade
2 parents 9f296b1 + 21a20ba commit 07041f1

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

.all-contributorsrc

+9
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,15 @@
593593
"contributions": [
594594
"doc"
595595
]
596+
},
597+
{
598+
"login": "Laishuxin",
599+
"name": "Laishuxin",
600+
"avatar_url": "https://avatars.githubusercontent.com/u/56504759?v=4",
601+
"profile": "https://github.com/Laishuxin",
602+
"contributions": [
603+
"doc"
604+
]
596605
}
597606
],
598607
"skipCi": true,

.github/workflows/validate.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: npm run validate
4848

4949
- name: ⬆️ Upload coverage report
50-
uses: codecov/codecov-action@v2.0.3
50+
uses: codecov/codecov-action@v2.1.0
5151

5252
release:
5353
needs: main

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ to test against. It also does not come installed with a specific renderer, we cu
146146
[`react-test-renderer`](https://www.npmjs.com/package/react-test-renderer) and
147147
[`react-dom`](https://www.npmjs.com/package/react-dom). You only need to install one of them,
148148
however, if you do have both installed, we will use `react-test-renderer` as the default. For more
149-
information see the [installation docs](https://react-hooks-testing-library.com/#installation).
149+
information see the [installation docs](https://react-hooks-testing-library.com/installation#renderer).
150150
Generally, the installed versions for `react` and the selected renderer should have matching
151151
versions:
152152

@@ -249,6 +249,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
249249
<td align="center"><a href="https://github.com/snowystinger"><img src="https://avatars.githubusercontent.com/u/698229?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Snow</b></sub></a><br /><a href="https://github.com/testing-library/react-hooks-testing-library/commits?author=snowystinger" title="Tests">⚠️</a></td>
250250
<td align="center"><a href="https://github.com/chris110408"><img src="https://avatars.githubusercontent.com/u/10645051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chris Chen</b></sub></a><br /><a href="https://github.com/testing-library/react-hooks-testing-library/commits?author=chris110408" title="Tests">⚠️</a></td>
251251
<td align="center"><a href="https://www.facebook.com/masoud.bonabi"><img src="https://avatars.githubusercontent.com/u/6429009?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Masious</b></sub></a><br /><a href="https://github.com/testing-library/react-hooks-testing-library/commits?author=masious" title="Documentation">📖</a></td>
252+
<td align="center"><a href="https://github.com/Laishuxin"><img src="https://avatars.githubusercontent.com/u/56504759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Laishuxin</b></sub></a><br /><a href="https://github.com/testing-library/react-hooks-testing-library/commits?author=Laishuxin" title="Documentation">📖</a></td>
252253
</tr>
253254
</table>
254255

docs/usage/ssr.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import { renderHook, act } from '@testing-library/react-hooks/server'
4646
import useCounter from './useCounter'
4747

4848
test('should increment counter', () => {
49-
const { result } = renderHook(() => useCounter(0))
49+
const { result } = renderHook(() => useCounter())
5050

5151
act(() => {
5252
result.current.increment()
@@ -64,7 +64,7 @@ import { renderHook, act } from '@testing-library/react-hooks/server'
6464
import useCounter from './useCounter'
6565

6666
test('should increment counter', () => {
67-
const { result, hydrate } = renderHook(() => useCounter(0))
67+
const { result, hydrate } = renderHook(() => useCounter())
6868

6969
hydrate()
7070

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
"react-error-boundary": "^3.1.0"
5757
},
5858
"devDependencies": {
59-
"@typescript-eslint/eslint-plugin": "4.30.0",
60-
"@typescript-eslint/parser": "4.30.0",
59+
"@typescript-eslint/eslint-plugin": "5.5.0",
60+
"@typescript-eslint/parser": "5.5.0",
6161
"all-contributors-cli": "6.20.0",
6262
"codecov": "3.8.3",
6363
"cross-env": "^7.0.3",
@@ -66,13 +66,13 @@
6666
"docz-utils": "2.3.0",
6767
"eslint": "7.32.0",
6868
"get-pkg-repo": "4.1.1",
69-
"kcd-scripts": "11.2.0",
70-
"prettier": "2.3.2",
69+
"kcd-scripts": "11.2.2",
70+
"prettier": "2.5.1",
7171
"react": "17.0.2",
7272
"react-dom": "17.0.2",
7373
"react-test-renderer": "17.0.2",
74-
"ts-node": "10.2.1",
75-
"typescript": "4.4.2"
74+
"ts-node": "10.4.0",
75+
"typescript": "4.5.2"
7676
},
7777
"peerDependencies": {
7878
"react": ">=16.9.0",

0 commit comments

Comments
 (0)