Skip to content

Commit

Permalink
Merge branch 'main' into react-18-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
snowystinger authored Dec 7, 2021
2 parents 9f296b1 + 21a20ba commit 07041f1
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 10 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,15 @@
"contributions": [
"doc"
]
},
{
"login": "Laishuxin",
"name": "Laishuxin",
"avatar_url": "https://avatars.githubusercontent.com/u/56504759?v=4",
"profile": "https://github.com/Laishuxin",
"contributions": [
"doc"
]
}
],
"skipCi": true,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: npm run validate

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

release:
needs: main
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ to test against. It also does not come installed with a specific renderer, we cu
[`react-test-renderer`](https://www.npmjs.com/package/react-test-renderer) and
[`react-dom`](https://www.npmjs.com/package/react-dom). You only need to install one of them,
however, if you do have both installed, we will use `react-test-renderer` as the default. For more
information see the [installation docs](https://react-hooks-testing-library.com/#installation).
information see the [installation docs](https://react-hooks-testing-library.com/installation#renderer).
Generally, the installed versions for `react` and the selected renderer should have matching
versions:

Expand Down Expand Up @@ -249,6 +249,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<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>
<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>
<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>
<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>
</tr>
</table>

Expand Down
4 changes: 2 additions & 2 deletions docs/usage/ssr.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import { renderHook, act } from '@testing-library/react-hooks/server'
import useCounter from './useCounter'

test('should increment counter', () => {
const { result } = renderHook(() => useCounter(0))
const { result } = renderHook(() => useCounter())

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

test('should increment counter', () => {
const { result, hydrate } = renderHook(() => useCounter(0))
const { result, hydrate } = renderHook(() => useCounter())

hydrate()

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
"react-error-boundary": "^3.1.0"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "4.30.0",
"@typescript-eslint/parser": "4.30.0",
"@typescript-eslint/eslint-plugin": "5.5.0",
"@typescript-eslint/parser": "5.5.0",
"all-contributors-cli": "6.20.0",
"codecov": "3.8.3",
"cross-env": "^7.0.3",
Expand All @@ -66,13 +66,13 @@
"docz-utils": "2.3.0",
"eslint": "7.32.0",
"get-pkg-repo": "4.1.1",
"kcd-scripts": "11.2.0",
"prettier": "2.3.2",
"kcd-scripts": "11.2.2",
"prettier": "2.5.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-test-renderer": "17.0.2",
"ts-node": "10.2.1",
"typescript": "4.4.2"
"ts-node": "10.4.0",
"typescript": "4.5.2"
},
"peerDependencies": {
"react": ">=16.9.0",
Expand Down

0 comments on commit 07041f1

Please sign in to comment.