Skip to content

Commit 3e65b4e

Browse files
committed
Merge branch 'main' into feat/concurrent-render
2 parents 0e2cf7d + 8f3bd3c commit 3e65b4e

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.all-contributorsrc

+9
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,15 @@
12701270
"contributions": [
12711271
"doc"
12721272
]
1273+
},
1274+
{
1275+
"login": "leschdom",
1276+
"name": "Dominik Lesch",
1277+
"avatar_url": "https://avatars.githubusercontent.com/u/62334278?v=4",
1278+
"profile": "https://github.com/leschdom",
1279+
"contributions": [
1280+
"doc"
1281+
]
12731282
}
12741283
],
12751284
"contributorsPerLine": 7,

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ merge of your pull request!
3737
- [ ] Documentation added to the
3838
[docs site](https://github.com/testing-library/testing-library-docs)
3939
- [ ] Tests
40-
- [ ] Typescript definitions updated
40+
- [ ] TypeScript definitions updated
4141
- [ ] Ready to be merged
4242
<!-- In your opinion, is this ready to be merged as soon as it's reviewed? -->
4343

CONTRIBUTING.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ sure to include those changes (if they exist) in your commit.
3535
### Update Typings
3636
3737
If your PR introduced some changes in the API, you are more than welcome to
38-
modify the Typescript type definition to reflect those changes. Just modify the
39-
`/types/index.d.ts` file accordingly. If you have never seen Typescript
38+
modify the TypeScript type definition to reflect those changes. Just modify the
39+
`/types/index.d.ts` file accordingly. If you have never seen TypeScript
4040
definitions before, you can read more about it in its
4141
[documentation pages](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html).
42-
Though this library itself is not written in Typescript we use
42+
Though this library itself is not written in TypeScript we use
4343
[dtslint](https://github.com/microsoft/dtslint) to lint our typings.
4444
4545
## Help needed
@@ -50,6 +50,5 @@ Also, please watch the repo and respond to questions/bug reports/feature
5050
requests! Thanks!
5151
5252
[egghead]:
53-
https://app.egghead.io/series/how-to-contribute-to-an-open-source-project-on-github
54-
[all-contributors]: https://github.com/all-contributors/all-contributors
53+
https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github
5554
[issues]: https://github.com/testing-library/react-testing-library/issues

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ Thanks goes to these people ([emoji key][emojis]):
609609
<td align="center"><a href="https://codepen.io/ariperkkio/"><img src="https://avatars.githubusercontent.com/u/14806298?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ari Perkkiö</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=AriPerkkio" title="Tests">⚠️</a></td>
610610
<td align="center"><a href="https://github.com/jhnns"><img src="https://avatars.githubusercontent.com/u/781746?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johannes Ewald</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=jhnns" title="Code">💻</a></td>
611611
<td align="center"><a href="https://github.com/anpaopao"><img src="https://avatars.githubusercontent.com/u/44686792?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Angus J. Pope</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=anpaopao" title="Documentation">📖</a></td>
612+
<td align="center"><a href="https://github.com/leschdom"><img src="https://avatars.githubusercontent.com/u/62334278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dominik Lesch</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=leschdom" title="Documentation">📖</a></td>
612613
</tr>
613614
</table>
614615

0 commit comments

Comments
 (0)