Skip to content

Commit a5a42c3

Browse files
authored
Merge branch 'main' into dependabot/add-v2-config-file
2 parents 7401e16 + 5307a37 commit a5a42c3

29 files changed

+405
-234
lines changed

.all-contributorsrc

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
"contributions": [
9191
"code",
9292
"doc",
93-
"test"
93+
"test",
94+
"review"
9495
]
9596
},
9697
{
@@ -102,6 +103,43 @@
102103
"bug",
103104
"code"
104105
]
106+
},
107+
{
108+
"login": "ronmerkin",
109+
"name": "Ron Merkin",
110+
"avatar_url": "https://avatars.githubusercontent.com/u/17492527?v=4",
111+
"profile": "https://github.com/ronmerkin",
112+
"contributions": [
113+
"code"
114+
]
115+
},
116+
{
117+
"login": "benmccann",
118+
"name": "Ben McCann",
119+
"avatar_url": "https://avatars.githubusercontent.com/u/322311?v=4",
120+
"profile": "http://www.benmccann.com",
121+
"contributions": [
122+
"test"
123+
]
124+
},
125+
{
126+
"login": "jgbowser",
127+
"name": "John Bowser",
128+
"avatar_url": "https://avatars.githubusercontent.com/u/66637570?v=4",
129+
"profile": "https://johnbowser.dev/",
130+
"contributions": [
131+
"code",
132+
"test"
133+
]
134+
},
135+
{
136+
"login": "ysaskia",
137+
"name": "Yoann",
138+
"avatar_url": "https://avatars.githubusercontent.com/u/1370679?v=4",
139+
"profile": "https://github.com/ysaskia",
140+
"contributions": [
141+
"code"
142+
]
105143
}
106144
],
107145
"contributorsPerLine": 7,

.babelrc

Lines changed: 0 additions & 6 deletions
This file was deleted.

.eslintrc.js renamed to .eslintrc.cjs

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,19 @@ module.exports = {
33
env: {
44
browser: true,
55
es6: true,
6-
jest: true
6+
'vitest-globals/env': true
77
},
8-
parser: 'babel-eslint',
9-
extends: [
10-
'standard'
11-
],
12-
plugins: [
13-
'svelte3',
14-
'simple-import-sort'
15-
],
8+
extends: ['standard', 'plugin:vitest-globals/recommended'],
9+
plugins: ['svelte', 'simple-import-sort'],
1610
rules: {
1711
'max-len': ['warn', { code: 100 }],
1812
'simple-import-sort/imports': 'error',
19-
'no-multiple-empty-lines': ['error', { max: 2, maxBOF: 2, maxEOF: 0 }]
13+
'no-multiple-empty-lines': ['error', { max: 2, maxBOF: 2, maxEOF: 0 }],
2014
},
2115
overrides: [
22-
{
23-
files: ['**/*.svelte'],
24-
processor: 'svelte3/svelte3'
25-
}
2616
],
2717
parserOptions: {
28-
ecmaVersion: 2019,
29-
sourceType: 'module'
30-
}
18+
ecmaVersion: 2022,
19+
sourceType: 'module',
20+
},
3121
}

.github/semantic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
enabled: false

.github/workflows/lint-pr.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: "Lint PR"
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- edited
8+
- synchronize
9+
10+
jobs:
11+
main:
12+
name: Validate PR title
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: amannn/action-semantic-pull-request@v4
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 59 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,75 @@ name: CI
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
612

713
jobs:
8-
test:
14+
main:
915
# ignore all-contributors PRs
1016
if: ${{ !contains(github.head_ref, 'all-contributors') }}
11-
12-
runs-on: ubuntu-latest
13-
1417
strategy:
1518
matrix:
16-
node: [10.x, 12.x]
17-
19+
node: [16, 18, 20]
20+
runs-on: ubuntu-latest
1821
steps:
19-
- name: Cancel previous runs
20-
uses: styfle/[email protected]
21-
with:
22-
access_token: ${{ secrets.GITHUB_TOKEN }}
22+
- name: ⬇️ Checkout repo
23+
uses: actions/checkout@v3
2324

24-
- uses: actions/checkout@v2
25+
- name: ⎔ Setup node
26+
uses: actions/setup-node@v3
27+
with:
28+
node-version: ${{ matrix.node }}
2529

26-
- name: Setup nodejs
27-
uses: actions/setup-node@v2-beta
28-
with:
29-
node-version: ${{ matrix.node }}
30-
- name: Install deps & validate
31-
run: npm run setup
30+
- name: 📥 Download deps
31+
uses: bahmutov/npm-install@v1
32+
with:
33+
useLockFile: false
34+
35+
- name: ▶️ Run validate script
36+
run: npm run validate
37+
38+
- name: ⬆️ Upload coverage report
39+
uses: codecov/codecov-action@v2
3240

3341
release:
42+
needs: main
3443
runs-on: ubuntu-latest
35-
44+
if: ${{ github.repository == 'testing-library/svelte-testing-library' &&
45+
contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha',
46+
github.ref) && github.event_name == 'push' }}
3647
steps:
37-
- name: Cancel previous runs
38-
uses: styfle/[email protected]
39-
with:
40-
access_token: ${{ secrets.GITHUB_TOKEN }}
41-
42-
- uses: actions/checkout@v2
43-
44-
- name: Setup nodejs
45-
uses: actions/setup-node@v2-beta
46-
with:
47-
node-version: 12.x
48-
- name: Install deps
49-
run: npm install
50-
- name: Build proj
51-
run: npm run build
52-
- name: Update tests, coverage, and release
53-
run: npm run test:update && npx codecov && npx semantic-release
54-
env:
55-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
56-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48+
- name: ⬇️ Checkout repo
49+
uses: actions/checkout@v3
50+
51+
- name: ⎔ Setup node
52+
uses: actions/setup-node@v3
53+
with:
54+
node-version: 16
55+
56+
- name: 📥 Download deps
57+
uses: bahmutov/npm-install@v1
58+
with:
59+
useLockFile: false
60+
61+
- name: 🚀 Release
62+
uses: cycjimmy/semantic-release-action@v2
63+
with:
64+
semantic_version: 17
65+
branches: |
66+
[
67+
'+([0-9])?(.{+([0-9]),x}).x',
68+
'main',
69+
'next',
70+
'next-major',
71+
{name: 'beta', prerelease: true},
72+
{name: 'alpha', prerelease: true}
73+
]
74+
env:
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.prettierrc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
semi: false
2+
singleQuote: true

README.md

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

13-
<p>Simple and complete Svelte testing utilities that encourage good testing
14-
practices.</p>
13+
<p>Simple and complete Svelte testing utilities that encourage good testing practices.</p>
1514

1615
[**Read The Docs**](https://testing-library.com/docs/svelte-testing-library/intro) |
1716
[Edit the docs](https://github.com/alexkrolick/testing-library-docs)
@@ -121,22 +120,27 @@ Thanks goes to these people ([emoji key][emojis]):
121120
<!-- markdownlint-disable -->
122121
<table>
123122
<tr>
124-
<td align="center"><a href="https://github.com/benmonro"><img src="https://avatars3.githubusercontent.com/u/399236?v=4" width="100px;" alt=""/><br /><sub><b>Ben Monro</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=benmonro" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=benmonro" title="Tests">⚠️</a> <a href="#ideas-benmonro" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=benmonro" title="Documentation">📖</a></td>
125-
<td align="center"><a href="https://twitter.com/EmilTholin"><img src="https://avatars0.githubusercontent.com/u/11573167?v=4" width="100px;" alt=""/><br /><sub><b>Emil Tholin</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=EmilTholin" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=EmilTholin" title="Tests">⚠️</a> <a href="#ideas-EmilTholin" title="Ideas, Planning, & Feedback">🤔</a></td>
126-
<td align="center"><a href="https://medium.com/@oieduardorabelo"><img src="https://avatars1.githubusercontent.com/u/829902?v=4" width="100px;" alt=""/><br /><sub><b>Eduardo Rabelo</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=oieduardorabelo" title="Tests">⚠️</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=oieduardorabelo" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=oieduardorabelo" title="Documentation">📖</a> <a href="#example-oieduardorabelo" title="Examples">💡</a></td>
127-
<td align="center"><a href="http://timdeschryver.dev"><img src="https://avatars1.githubusercontent.com/u/28659384?v=4" width="100px;" alt=""/><br /><sub><b>Tim Deschryver</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=timdeschryver" title="Documentation">📖</a></td>
128-
<td align="center"><a href="http://www.ematipico.com"><img src="https://avatars3.githubusercontent.com/u/602478?v=4" width="100px;" alt=""/><br /><sub><b>Emanuele</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=ematipico" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=ematipico" title="Tests">⚠️</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=ematipico" title="Documentation">📖</a></td>
129-
<td align="center"><a href="https://github.com/pngwn"><img src="https://avatars1.githubusercontent.com/u/12937446?v=4" width="100px;" alt=""/><br /><sub><b>pngwn</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=pngwn" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=pngwn" title="Tests">⚠️</a></td>
130-
<td align="center"><a href="https://twitter.com/sebsilbermann"><img src="https://avatars3.githubusercontent.com/u/12292047?v=4" width="100px;" alt=""/><br /><sub><b>Sebastian Silbermann</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=eps1lon" title="Code">💻</a></td>
123+
<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/svelte-testing-library/commits?author=benmonro" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=benmonro" title="Tests">⚠️</a> <a href="#ideas-benmonro" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=benmonro" title="Documentation">📖</a></td>
124+
<td align="center"><a href="https://twitter.com/EmilTholin"><img src="https://avatars0.githubusercontent.com/u/11573167?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Emil Tholin</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=EmilTholin" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=EmilTholin" title="Tests">⚠️</a> <a href="#ideas-EmilTholin" title="Ideas, Planning, & Feedback">🤔</a></td>
125+
<td align="center"><a href="https://medium.com/@oieduardorabelo"><img src="https://avatars1.githubusercontent.com/u/829902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eduardo Rabelo</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=oieduardorabelo" title="Tests">⚠️</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=oieduardorabelo" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=oieduardorabelo" title="Documentation">📖</a> <a href="#example-oieduardorabelo" title="Examples">💡</a></td>
126+
<td align="center"><a href="http://timdeschryver.dev"><img src="https://avatars1.githubusercontent.com/u/28659384?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim Deschryver</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=timdeschryver" title="Documentation">📖</a></td>
127+
<td align="center"><a href="http://www.ematipico.com"><img src="https://avatars3.githubusercontent.com/u/602478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Emanuele</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=ematipico" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=ematipico" title="Tests">⚠️</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=ematipico" title="Documentation">📖</a></td>
128+
<td align="center"><a href="https://github.com/pngwn"><img src="https://avatars1.githubusercontent.com/u/12937446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pngwn</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=pngwn" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=pngwn" title="Tests">⚠️</a></td>
129+
<td align="center"><a href="https://twitter.com/sebsilbermann"><img src="https://avatars3.githubusercontent.com/u/12292047?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Silbermann</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=eps1lon" title="Code">💻</a></td>
131130
</tr>
132131
<tr>
133-
<td align="center"><a href="https://github.com/mihar-22"><img src="https://avatars3.githubusercontent.com/u/14304599?s=460&v=4" width="100px;" alt=""/><br /><sub><b>Rahim Alwer</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=mihar-22" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=mihar-22" title="Documentation">📖</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=mihar-22" title="Tests">⚠️</a></td>
134-
<td align="center"><a href="https://github.com/MirrorBytes"><img src="https://avatars3.githubusercontent.com/u/22119469?v=4" width="100px;" alt=""/><br /><sub><b>Bob</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/issues?q=author%3AMirrorBytes" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=MirrorBytes" title="Code">💻</a></td>
132+
<td align="center"><a href="https://github.com/mihar-22"><img src="https://avatars3.githubusercontent.com/u/14304599?s=460&v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rahim Alwer</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=mihar-22" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=mihar-22" title="Documentation">📖</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=mihar-22" title="Tests">⚠️</a> <a href="https://github.com/testing-library/svelte-testing-library/pulls?q=is%3Apr+reviewed-by%3Amihar-22" title="Reviewed Pull Requests">👀</a></td>
133+
<td align="center"><a href="https://github.com/MirrorBytes"><img src="https://avatars3.githubusercontent.com/u/22119469?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bob</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/issues?q=author%3AMirrorBytes" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=MirrorBytes" title="Code">💻</a></td>
134+
<td align="center"><a href="https://github.com/ronmerkin"><img src="https://avatars.githubusercontent.com/u/17492527?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ron Merkin</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=ronmerkin" title="Code">💻</a></td>
135+
<td align="center"><a href="http://www.benmccann.com"><img src="https://avatars.githubusercontent.com/u/322311?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben McCann</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=benmccann" title="Tests">⚠️</a></td>
136+
<td align="center"><a href="https://johnbowser.dev/"><img src="https://avatars.githubusercontent.com/u/66637570?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Bowser</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=jgbowser" title="Code">💻</a> <a href="https://github.com/testing-library/svelte-testing-library/commits?author=jgbowser" title="Tests">⚠️</a></td>
137+
<td align="center"><a href="https://github.com/ysaskia"><img src="https://avatars.githubusercontent.com/u/1370679?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yoann</b></sub></a><br /><a href="https://github.com/testing-library/svelte-testing-library/commits?author=ysaskia" title="Code">💻</a></td>
135138
</tr>
136139
</table>
137140

138-
<!-- markdownlint-enable -->
141+
<!-- markdownlint-restore -->
139142
<!-- prettier-ignore-end -->
143+
140144
<!-- ALL-CONTRIBUTORS-LIST:END -->
141145

142146
This project follows the [all-contributors][all-contributors] specification.
@@ -161,12 +165,12 @@ Contributions of any kind welcome!
161165
[discord-badge]: https://img.shields.io/discord/723559267868737556.svg?color=7389D8&labelColor=6A7EC2&logo=discord&logoColor=ffffff&style=flat-square
162166
[discord]: https://discord.gg/testing-library
163167
[license-badge]: https://img.shields.io/github/license/testing-library/svelte-testing-library?color=b
164-
[license]: https://github.com/testing-library/svelte-testing-library/blob/master/LICENSE
168+
[license]: https://github.com/testing-library/svelte-testing-library/blob/main/LICENSE
165169
[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
166170
[prs]: http://makeapullrequest.com
167171
[donate-badge]: https://img.shields.io/badge/$-support-green.svg?style=flat-square
168172
[coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square
169-
[coc]: https://github.com/testing-library/svelte-testing-library/blob/master/CODE_OF_CONDUCT.md
173+
[coc]: https://github.com/testing-library/svelte-testing-library/blob/main/CODE_OF_CONDUCT.md
170174
[github-watch-badge]: https://img.shields.io/github/watchers/testing-library/svelte-testing-library.svg?style=social
171175
[github-watch]: https://github.com/testing-library/svelte-testing-library/watchers
172176
[github-star-badge]: https://img.shields.io/github/stars/testing-library/svelte-testing-library.svg?style=social

dont-clean-up-after-each.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)