Skip to content

Commit 1bfaba9

Browse files
authored
Merge pull request #165 from reactjs/sync-abe931a8
Sync with react.dev @ abe931a
2 parents 7331cdb + 5cbd611 commit 1bfaba9

File tree

138 files changed

+11959
-614
lines changed

Some content is hidden

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

138 files changed

+11959
-614
lines changed

.eslintrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@
55
"plugins": ["@typescript-eslint"],
66
"rules": {
77
"no-unused-vars": "off",
8+
<<<<<<< HEAD
89
"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_" }],
910
"react-hooks/exhaustive-deps": "error"
11+
=======
12+
"@typescript-eslint/no-unused-vars": ["error", {"varsIgnorePattern": "^_"}],
13+
"react-hooks/exhaustive-deps": "error",
14+
"react/no-unknown-property": ["error", {"ignore": ["meta"]}],
15+
"react-compiler/react-compiler": "error",
16+
"local-rules/lint-markdown-code-blocks": "error",
17+
"no-trailing-spaces": "error"
18+
>>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
1019
},
1120
"env": {
1221
"node": true,
4.13 KB
5.77 KB
2.9 KB
32.8 KB
38.7 KB
115 KB
17.7 KB
4.79 KB
2.44 KB

0 commit comments

Comments
 (0)