Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit cabd517

Browse files
authored
Merge branch 'main' into pr/playground-link-in-error-message
2 parents 1c4f22b + 4b2976d commit cabd517

40 files changed

+773
-607
lines changed

‎.all-contributorsrc‎

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,8 @@
10201020
"doc",
10211021
"code",
10221022
"test",
1023-
"review"
1023+
"review",
1024+
"infra"
10241025
]
10251026
},
10261027
{
@@ -1309,7 +1310,8 @@
13091310
"profile": "https://codepen.io/ariperkkio/",
13101311
"contributions": [
13111312
"bug",
1312-
"code"
1313+
"code",
1314+
"doc"
13131315
]
13141316
},
13151317
{
@@ -1320,6 +1322,71 @@
13201322
"contributions": [
13211323
"code"
13221324
]
1325+
},
1326+
{
1327+
"login": "ph-fritsche",
1328+
"name": "Philipp Fritsche",
1329+
"avatar_url": "https://avatars.githubusercontent.com/u/39068198?v=4",
1330+
"profile": "https://github.com/ph-fritsche",
1331+
"contributions": [
1332+
"code"
1333+
]
1334+
},
1335+
{
1336+
"login": "renatoalencar",
1337+
"name": "Renato Alencar",
1338+
"avatar_url": "https://avatars.githubusercontent.com/u/6964593?v=4",
1339+
"profile": "https://medium.com/@renatoalencar",
1340+
"contributions": [
1341+
"code",
1342+
"test"
1343+
]
1344+
},
1345+
{
1346+
"login": "SimenB",
1347+
"name": "Simen Bekkhus",
1348+
"avatar_url": "https://avatars.githubusercontent.com/u/1404810?v=4",
1349+
"profile": "https://github.com/SimenB",
1350+
"contributions": [
1351+
"bug"
1352+
]
1353+
},
1354+
{
1355+
"login": "gaearon",
1356+
"name": "Dan Abramov",
1357+
"avatar_url": "https://avatars.githubusercontent.com/u/810438?v=4",
1358+
"profile": "https://github.com/gaearon",
1359+
"contributions": [
1360+
"bug",
1361+
"review"
1362+
]
1363+
},
1364+
{
1365+
"login": "MatanBobi",
1366+
"name": "Matan Borenkraout",
1367+
"avatar_url": "https://avatars.githubusercontent.com/u/12711091?v=4",
1368+
"profile": "https://matan.io",
1369+
"contributions": [
1370+
"code"
1371+
]
1372+
},
1373+
{
1374+
"login": "simcha90",
1375+
"name": "simcha90",
1376+
"avatar_url": "https://avatars.githubusercontent.com/u/56388545?v=4",
1377+
"profile": "https://github.com/simcha90",
1378+
"contributions": [
1379+
"code"
1380+
]
1381+
},
1382+
{
1383+
"login": "amitmiran137",
1384+
"name": "Amit Miran",
1385+
"avatar_url": "https://avatars.githubusercontent.com/u/47772523?v=4",
1386+
"profile": "https://github.com/amitmiran137",
1387+
"contributions": [
1388+
"infra"
1389+
]
13231390
}
13241391
],
13251392
"repoHost": "https://github.com"

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ supported version.
3131
Relevant code or config
3232

3333
```js
34+
3435
```
3536

3637
What you did:

‎.github/workflows/validate.yml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- '+([0-9])?(.{+([0-9]),x}).x'
6-
- 'master'
6+
- 'main'
77
- 'next'
88
- 'next-major'
99
- 'beta'
@@ -16,19 +16,20 @@ jobs:
1616
if: ${{ !contains(github.head_ref, 'all-contributors') }}
1717
strategy:
1818
matrix:
19-
node: [10.14.2, 12, 14, 15]
19+
node: [10.14.2, 12, 14, 15, 16]
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: 🛑 Cancel Previous Runs
23-
uses: styfle/cancel-workflow-action@0.6.0
24-
with:
25-
access_token: ${{ secrets.GITHUB_TOKEN }}
23+
uses: styfle/cancel-workflow-action@0.9.0
2624

2725
- name: ⬇️ Checkout repo
2826
uses: actions/checkout@v2
27+
with:
28+
# required by codecov/codecov-action
29+
fetch-depth: 0
2930

3031
- name: ⎔ Setup node
31-
uses: actions/setup-node@v1
32+
uses: actions/setup-node@v2
3233
with:
3334
node-version: ${{ matrix.node }}
3435

@@ -37,30 +38,35 @@ jobs:
3738
with:
3839
useLockFile: false
3940

41+
# TODO: Can be removed if https://github.com/kentcdodds/kcd-scripts/pull/146 is released
42+
- name: Verify format (`npm run format` committed?)
43+
run: npm run format -- --check --no-write
44+
4045
- name: ▶️ Run validate script
4146
run: npm run validate
4247

4348
- name: ⬆️ Upload coverage report
4449
uses: codecov/codecov-action@v1
50+
with:
51+
fail_ci_if_error: true
52+
flags: node-${{ matrix.node }}
4553

4654
release:
4755
needs: main
4856
runs-on: ubuntu-latest
4957
if:
5058
${{ github.repository == 'testing-library/dom-testing-library' &&
51-
contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha',
59+
contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha',
5260
github.ref) && github.event_name == 'push' }}
5361
steps:
5462
- name: 🛑 Cancel Previous Runs
55-
uses: styfle/cancel-workflow-action@0.6.0
56-
with:
57-
access_token: ${{ secrets.GITHUB_TOKEN }}
63+
uses: styfle/cancel-workflow-action@0.9.0
5864

5965
- name: ⬇️ Checkout repo
6066
uses: actions/checkout@v2
6167

6268
- name: ⎔ Setup node
63-
uses: actions/setup-node@v1
69+
uses: actions/setup-node@v2
6470
with:
6571
node-version: 14
6672

@@ -79,7 +85,7 @@ jobs:
7985
branches: |
8086
[
8187
'+([0-9])?(.{+([0-9]),x}).x',
82-
'master',
88+
'main',
8389
'next',
8490
'next-major',
8591
{name: 'beta', prerelease: true},

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,27 @@ series [How to Contribute to an Open Source Project on GitHub][egghead]
1111
2. Run `npm run setup` to install dependencies and run validation
1212
3. Create a branch for your PR with `git checkout -b pr/your-branch-name`
1313

14-
> Tip: Keep your `master` branch pointing at the original repository and make
15-
> pull requests from branches on your fork. To do this, run:
14+
> Tip: Keep your `main` branch pointing at the original repository and make pull
15+
> requests from branches on your fork. To do this, run:
1616
>
1717
> ```
1818
> git remote add upstream https://github.com/testing-library/dom-testing-library.git
1919
> git fetch upstream
20-
> git branch --set-upstream-to=upstream/master master
20+
> git branch --set-upstream-to=upstream/main main
2121
> ```
2222
>
2323
> This will add the original repository as a "remote" called "upstream," Then
24-
> fetch the git information from that remote, then set your local `master`
25-
> branch to use the upstream master branch whenever you run `git pull`. Then you
26-
> can make all of your pull request branches based on this `master` branch.
27-
> Whenever you want to update your version of `master`, do a regular `git pull`.
24+
> fetch the git information from that remote, then set your local `main` branch
25+
> to use the upstream main branch whenever you run `git pull`. Then you can make
26+
> all of your pull request branches based on this `main` branch. Whenever you
27+
> want to update your version of `main`, do a regular `git pull`.
2828
2929
## Committing and Pushing changes
3030
3131
Please make sure to run the tests before you commit your changes. You can run
3232
`npm run test:update` which will update any snapshots that need updating. Make
3333
sure to include those changes (if they exist) in your commit.
3434
35-
### opt into git hooks
36-
37-
There are git hooks set up with this project that are automatically installed
38-
when you install dependencies. They're really handy, but are turned off by
39-
default (so as to not hinder new contributors). You can opt into these by
40-
creating a file called `.opt-in` at the root of the project and putting this
41-
inside:
42-
43-
```
44-
pre-commit
45-
```
46-
4735
## Help needed
4836
4937
Please checkout the [the open issues][issues]

‎README.md‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
height="80"
77
width="80"
88
alt="octopus"
9-
src="https://raw.githubusercontent.com/testing-library/dom-testing-library/master/other/octopus.png"
9+
src="https://raw.githubusercontent.com/testing-library/dom-testing-library/main/other/octopus.png"
1010
/>
1111
</a>
1212

@@ -41,7 +41,7 @@ practices.</p>
4141
<img
4242
width="500"
4343
alt="TestingJavaScript.com Learn the smart, efficient way to test any JavaScript application."
44-
src="https://raw.githubusercontent.com/testing-library/dom-testing-library/master/other/testingjavascript.jpg"
44+
src="https://raw.githubusercontent.com/testing-library/dom-testing-library/main/other/testingjavascript.jpg"
4545
/>
4646
</a>
4747
</div>
@@ -262,7 +262,7 @@ Thanks goes to these people ([emoji key][emojis]):
262262
<td align="center"><a href="https://github.com/benmonro"><img src="https://avatars3.githubusercontent.com/u/399236?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben Monro</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=benmonro" title="Code">💻</a> <a href="#ideas-benmonro" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=benmonro" title="Tests">⚠️</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=benmonro" title="Documentation">📖</a></td>
263263
<td align="center"><a href="https://github.com/smeijer"><img src="https://avatars1.githubusercontent.com/u/1196524?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephan Meijer</b></sub></a><br /><a href="#ideas-smeijer" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=smeijer" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=smeijer" title="Tests">⚠️</a></td>
264264
<td align="center"><a href="https://joaoforja.com/"><img src="https://avatars2.githubusercontent.com/u/7002157?v=4?s=100" width="100px;" alt=""/><br /><sub><b>João Forja</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=Jnforja" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=Jnforja" title="Tests">⚠️</a></td>
265-
<td align="center"><a href="https://nickmccurdy.com/"><img src="https://avatars0.githubusercontent.com/u/927220?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick McCurdy</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=nickmccurdy" title="Documentation">📖</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=nickmccurdy" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=nickmccurdy" title="Tests">⚠️</a> <a href="https://github.com/testing-library/dom-testing-library/pulls?q=is%3Apr+reviewed-by%3Anickmccurdy" title="Reviewed Pull Requests">👀</a></td>
265+
<td align="center"><a href="https://nickmccurdy.com/"><img src="https://avatars0.githubusercontent.com/u/927220?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick McCurdy</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=nickmccurdy" title="Documentation">📖</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=nickmccurdy" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=nickmccurdy" title="Tests">⚠️</a> <a href="https://github.com/testing-library/dom-testing-library/pulls?q=is%3Apr+reviewed-by%3Anickmccurdy" title="Reviewed Pull Requests">👀</a> <a href="#infra-nickmccurdy" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
266266
<td align="center"><a href="http://calebmer.com"><img src="https://avatars1.githubusercontent.com/u/8282507?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Caleb Meredith</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=calebmer" title="Code">💻</a></td>
267267
<td align="center"><a href="https://github.com/marcosvega91"><img src="https://avatars2.githubusercontent.com/u/5365582?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marco Moretti</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=marcosvega91" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=marcosvega91" title="Tests">⚠️</a> <a href="https://github.com/testing-library/dom-testing-library/pulls?q=is%3Apr+reviewed-by%3Amarcosvega91" title="Reviewed Pull Requests">👀</a></td>
268268
</tr>
@@ -300,10 +300,19 @@ Thanks goes to these people ([emoji key][emojis]):
300300
<td align="center"><a href="https://github.com/romain-trotard"><img src="https://avatars0.githubusercontent.com/u/17161484?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Romain Trotard</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=romain-trotard" title="Code">💻</a></td>
301301
<td align="center"><a href="http://www.thomasmarshall.com"><img src="https://avatars0.githubusercontent.com/u/770763?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Marshall</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=thomasmarshall" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=thomasmarshall" title="Tests">⚠️</a></td>
302302
<td align="center"><a href="https://github.com/johnjesse"><img src="https://avatars1.githubusercontent.com/u/6839660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>johnjessewood</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/issues?q=author%3Ajohnjesse" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=johnjesse" title="Code">💻</a></td>
303-
<td align="center"><a href="https://codepen.io/ariperkkio/"><img src="https://avatars2.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/dom-testing-library/issues?q=author%3AAriPerkkio" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=AriPerkkio" title="Code">💻</a></td>
303+
<td align="center"><a href="https://codepen.io/ariperkkio/"><img src="https://avatars2.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/dom-testing-library/issues?q=author%3AAriPerkkio" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=AriPerkkio" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=AriPerkkio" title="Documentation">📖</a></td>
304304
</tr>
305305
<tr>
306306
<td align="center"><a href="https://github.com/nathanforce"><img src="https://avatars2.githubusercontent.com/u/6694194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Force</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=nathanforce" title="Code">💻</a></td>
307+
<td align="center"><a href="https://github.com/ph-fritsche"><img src="https://avatars.githubusercontent.com/u/39068198?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philipp Fritsche</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=ph-fritsche" title="Code">💻</a></td>
308+
<td align="center"><a href="https://medium.com/@renatoalencar"><img src="https://avatars.githubusercontent.com/u/6964593?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Renato Alencar</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=renatoalencar" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=renatoalencar" title="Tests">⚠️</a></td>
309+
<td align="center"><a href="https://github.com/SimenB"><img src="https://avatars.githubusercontent.com/u/1404810?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simen Bekkhus</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/issues?q=author%3ASimenB" title="Bug reports">🐛</a></td>
310+
<td align="center"><a href="https://github.com/gaearon"><img src="https://avatars.githubusercontent.com/u/810438?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dan Abramov</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/issues?q=author%3Agaearon" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/dom-testing-library/pulls?q=is%3Apr+reviewed-by%3Agaearon" title="Reviewed Pull Requests">👀</a></td>
311+
<td align="center"><a href="https://matan.io"><img src="https://avatars.githubusercontent.com/u/12711091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matan Borenkraout</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=MatanBobi" title="Code">💻</a></td>
312+
<td align="center"><a href="https://github.com/simcha90"><img src="https://avatars.githubusercontent.com/u/56388545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>simcha90</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=simcha90" title="Code">💻</a></td>
313+
</tr>
314+
<tr>
315+
<td align="center"><a href="https://github.com/amitmiran137"><img src="https://avatars.githubusercontent.com/u/47772523?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Amit Miran</b></sub></a><br /><a href="#infra-amitmiran137" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
307316
</tr>
308317
</table>
309318

@@ -332,11 +341,11 @@ Contributions of any kind welcome!
332341
[downloads-badge]: https://img.shields.io/npm/dm/@testing-library/dom.svg?style=flat-square
333342
[npmtrends]: http://www.npmtrends.com/@testing-library/dom
334343
[license-badge]: https://img.shields.io/npm/l/@testing-library/dom.svg?style=flat-square
335-
[license]: https://github.com/testing-library/dom-testing-library/blob/master/LICENSE
344+
[license]: https://github.com/testing-library/dom-testing-library/blob/main/LICENSE
336345
[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
337346
[prs]: http://makeapullrequest.com
338347
[coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square
339-
[coc]: https://github.com/testing-library/dom-testing-library/blob/master/CODE_OF_CONDUCT.md
348+
[coc]: https://github.com/testing-library/dom-testing-library/blob/main/CODE_OF_CONDUCT.md
340349
[github-watch-badge]: https://img.shields.io/github/watchers/testing-library/dom-testing-library.svg?style=social
341350
[github-watch]: https://github.com/testing-library/dom-testing-library/watchers
342351
[github-star-badge]: https://img.shields.io/github/stars/testing-library/dom-testing-library.svg?style=social

‎other/MAINTAINING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ to release. See the next section on Releases for more about that.
6161

6262
## Release
6363

64-
Our releases are automatic. They happen whenever code lands into `master`. A
64+
Our releases are automatic. They happen whenever code lands into `main`. A
6565
GitHub Action gets kicked off and if it's successful, a tool called
6666
[`semantic-release`](https://github.com/semantic-release/semantic-release) is
6767
used to automatically publish a new release to npm as well as a changelog to

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
},
2626
"scripts": {
2727
"build": "kcd-scripts build --no-ts-defs --ignore \"**/__tests__/**,**/__node_tests__/**,**/__mocks__/**\" && kcd-scripts build --no-ts-defs --bundle --no-clean",
28+
"format": "kcd-scripts format",
2829
"lint": "kcd-scripts lint",
2930
"setup": "npm install && npm run validate -s",
3031
"test": "kcd-scripts test",
@@ -35,7 +36,7 @@
3536
},
3637
"files": [
3738
"dist",
38-
"types"
39+
"types/*.d.ts"
3940
],
4041
"dependencies": {
4142
"@babel/code-frame": "^7.10.4",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /