Skip to content

Commit 84a2090

Browse files
Merge branch 'main' into patch-1
2 parents d1cba9c + e2ea687 commit 84a2090

File tree

116 files changed

+16449
-15807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+16449
-15807
lines changed

.all-contributorsrc

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,38 @@
512512
"code",
513513
"test"
514514
]
515+
},
516+
{
517+
"login": "Semigradsky",
518+
"name": "Dmitry Semigradsky",
519+
"avatar_url": "https://avatars.githubusercontent.com/u/1198848?v=4",
520+
"profile": "https://semigradsky.dev/",
521+
"contributions": [
522+
"code",
523+
"test",
524+
"doc"
525+
]
526+
},
527+
{
528+
"login": "sjarva",
529+
"name": "Senja",
530+
"avatar_url": "https://avatars.githubusercontent.com/u/1133238?v=4",
531+
"profile": "https://github.com/sjarva",
532+
"contributions": [
533+
"code",
534+
"test",
535+
"doc"
536+
]
537+
},
538+
{
539+
"login": "brenocota-hotmart",
540+
"name": "Breno Cota",
541+
"avatar_url": "https://avatars.githubusercontent.com/u/106157862?v=4",
542+
"profile": "https://dbrno.vercel.app",
543+
"contributions": [
544+
"code",
545+
"test"
546+
]
515547
}
516548
],
517549
"contributorsPerLine": 7,

.eslintrc.json

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
{
2-
"env": {
3-
"commonjs": true,
4-
"es6": true,
5-
"node": true,
6-
"jest/globals": true
7-
},
8-
"extends": [
9-
"kentcdodds",
10-
"plugin:@typescript-eslint/eslint-recommended",
11-
"plugin:@typescript-eslint/recommended",
12-
"prettier",
13-
"plugin:jest/recommended",
14-
"plugin:jest-formatting/recommended"
15-
],
16-
"plugins": ["@typescript-eslint", "jest", "jest-formatting"],
17-
"globals": {
18-
"Atomics": "readonly",
19-
"SharedArrayBuffer": "readonly"
20-
},
21-
"parser": "@typescript-eslint/parser",
22-
"parserOptions": {
23-
"project": "./tsconfig.eslint.json"
24-
},
25-
"rules": {
26-
// TS
27-
"@typescript-eslint/explicit-function-return-type": "off",
28-
"@typescript-eslint/no-unused-vars": [
29-
"warn",
30-
{ "argsIgnorePattern": "^_" }
31-
],
32-
"@typescript-eslint/no-use-before-define": "off",
2+
"env": {
3+
"commonjs": true,
4+
"es6": true,
5+
"node": true,
6+
"jest/globals": true
7+
},
8+
"extends": [
9+
"kentcdodds",
10+
"plugin:@typescript-eslint/eslint-recommended",
11+
"plugin:@typescript-eslint/recommended",
12+
"prettier",
13+
"plugin:jest/recommended",
14+
"plugin:jest-formatting/recommended"
15+
],
16+
"plugins": ["@typescript-eslint", "jest", "jest-formatting"],
17+
"globals": {
18+
"Atomics": "readonly",
19+
"SharedArrayBuffer": "readonly"
20+
},
21+
"parser": "@typescript-eslint/parser",
22+
"parserOptions": {
23+
"project": "./tsconfig.eslint.json"
24+
},
25+
"rules": {
26+
// TS
27+
"@typescript-eslint/explicit-function-return-type": "off",
28+
"@typescript-eslint/no-unused-vars": [
29+
"warn",
30+
{ "argsIgnorePattern": "^_" }
31+
],
32+
"@typescript-eslint/no-use-before-define": "off",
3333

34-
// ESLint
35-
"max-lines-per-function": "off",
36-
"no-restricted-imports": [
37-
"error",
38-
{
39-
"patterns": ["@typescript-eslint/utils/dist/*"]
40-
}
41-
],
34+
// ESLint
35+
"max-lines-per-function": "off",
36+
"no-restricted-imports": [
37+
"error",
38+
{
39+
"patterns": ["@typescript-eslint/utils/dist/*"]
40+
}
41+
],
4242

43-
// Import
44-
"import/no-import-module-exports": "off",
45-
"import/order": [
46-
"warn",
47-
{
48-
"groups": ["builtin", "external", "parent", "sibling", "index"],
49-
"newlines-between": "always",
50-
"alphabetize": {
51-
"order": "asc",
52-
"caseInsensitive": false
53-
}
54-
}
55-
]
56-
}
43+
// Import
44+
"import/no-import-module-exports": "off",
45+
"import/order": [
46+
"warn",
47+
{
48+
"groups": ["builtin", "external", "parent", "sibling", "index"],
49+
"newlines-between": "always",
50+
"alphabetize": {
51+
"order": "asc",
52+
"caseInsensitive": false
53+
}
54+
}
55+
]
56+
}
5757
}

.github/workflows/pipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121

2222
steps:
2323
- name: Cancel Previous Runs
24-
uses: styfle/cancel-workflow-action@0.10.0
24+
uses: styfle/cancel-workflow-action@0.11.0
2525

2626
- name: Checkout
2727
uses: actions/checkout@v3
2828

2929
- name: Use Node
3030
uses: actions/setup-node@v3
3131
with:
32-
node-version: 16
32+
node-version-file: '.nvmrc'
3333

3434
- name: Install dependencies
3535
uses: bahmutov/npm-install@v1
@@ -56,7 +56,7 @@ jobs:
5656

5757
steps:
5858
- name: Cancel Previous Runs
59-
uses: styfle/cancel-workflow-action@0.10.0
59+
uses: styfle/cancel-workflow-action@0.11.0
6060

6161
- name: Checkout
6262
uses: actions/checkout@v3
@@ -88,15 +88,15 @@ jobs:
8888

8989
steps:
9090
- name: Cancel Previous Runs
91-
uses: styfle/cancel-workflow-action@0.10.0
91+
uses: styfle/cancel-workflow-action@0.11.0
9292

9393
- name: Checkout
9494
uses: actions/checkout@v3
9595

9696
- name: Use Node
9797
uses: actions/setup-node@v3
9898
with:
99-
node-version: 16
99+
node-version-file: '.nvmrc'
100100

101101
- name: Install dependencies
102102
uses: bahmutov/npm-install@v1

.github/workflows/smoke-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
- uses: actions/checkout@v3
1515
- uses: actions/setup-node@v3
1616
with:
17-
node-version: 16
17+
node-version-file: '.nvmrc'
18+
cache: 'npm'
1819
- run: |
1920
npm install
2021
npm run build

.lintstagedrc

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

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
package-lock=false
2+
auto-install-peers=true

.nvmrc

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

.prettierrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module.exports = {
2-
singleQuote: true,
2+
singleQuote: true,
3+
useTabs: true,
34
};

.releaserc.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"pkgRoot": "dist",
3-
"branches": [
4-
"+([0-9])?(.{+([0-9]),x}).x",
5-
"main",
6-
"next",
7-
"next-major",
8-
{
9-
"name": "beta",
10-
"prerelease": true
11-
},
12-
{
13-
"name": "alpha",
14-
"prerelease": true
15-
}
16-
]
2+
"pkgRoot": "dist",
3+
"branches": [
4+
"+([0-9])?(.{+([0-9]),x}).x",
5+
"main",
6+
"next",
7+
"next-major",
8+
{
9+
"name": "beta",
10+
"prerelease": true
11+
},
12+
{
13+
"name": "alpha",
14+
"prerelease": true
15+
}
16+
]
1717
}

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ If you wish to run a single test while developing locally, add `only: true` to t
118118
119119
```javascript
120120
valid: [
121-
{
122-
only: true,
123-
code: `...`,
124-
},
121+
{
122+
only: true,
123+
code: `...`,
124+
},
125125
];
126126
```
127127
@@ -137,9 +137,9 @@ Since the plugin will report differently depending on which Testing Library pack
137137
import { render } from '@testing-library/react';
138138

139139
test('should report invalid render usage', () => {
140-
// the following line is the actual code you needed to test your rule,
141-
// but everything else helps finding edge cases and makes it more robust.
142-
const wrapper = render(<Component />);
140+
// the following line is the actual code you needed to test your rule,
141+
// but everything else helps finding edge cases and makes it more robust.
142+
const wrapper = render(<Component />);
143143
});
144144
```
145145

MAINTAINERS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
This document outlines some processes that the maintainers should stick to.
22

3+
## Node.js version
4+
5+
We will try to stick to the same range of [Node.js versions supported by ESLint](https://github.com/eslint/eslint#installation-and-usage) as much as possible.
6+
7+
For local development and CI, we will use the Maintenance LTS version (specified in `.nvmrc` file).
8+
39
## Issues Process
410

511
There are 3 types of issues that can be created:

0 commit comments

Comments
 (0)