Skip to content

Commit 57361a3

Browse files
committed
Merge branch '2.0.0-beta' into 2.0.0-next
2 parents dfa7923 + df52cd5 commit 57361a3

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"editor.defaultFormatter": "dprint.dprint"
44
},
55
"[jsonc]": {
6-
"editor.defaultFormatter": "vscode.json-language-features"
6+
"editor.defaultFormatter": "dprint.dprint"
77
},
88
"[typescript]": {
99
"editor.defaultFormatter": "dprint.dprint"

apps/website/eslint.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ export default tseslint.config(
7979
rules: {
8080
...pluginReactHooks.configs.recommended.rules,
8181
"@eslint-react/naming-convention/filename": ["error", { rule: "kebab-case" }],
82+
"@eslint-react/no-unused-props": "warn",
8283
"react-refresh/only-export-components": "warn",
8384
},
8485
},
@@ -98,6 +99,7 @@ export default tseslint.config(
9899
{
99100
extends: [
100101
configs.disableTypeChecked,
102+
react.configs["disable-type-checked"],
101103
],
102104
files: [...GLOB_JS, ...GLOB_CONFIG],
103105
rules: {

apps/website/tsconfig.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
],
2020
"#/*": [
2121
"./*"
22-
],
23-
"#/.source": [
24-
"./.source/index.ts"
2522
]
2623
},
2724
"plugins": [

packages/plugins/eslint-plugin-react-x/src/plugin.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,13 @@ import preferNamespaceImport from "./rules/prefer-namespace-import";
6262
import preferReadOnlyProps from "./rules/prefer-read-only-props";
6363
import preferUseStateLazyInitialization from "./rules/prefer-use-state-lazy-initialization";
6464

65-
/* eslint-disable perfectionist/sort-imports */
6665
import avoidShorthandBoolean from "./rules-removed/avoid-shorthand-boolean";
6766
import avoidShorthandFragment from "./rules-removed/avoid-shorthand-fragment";
6867
import noCommentTextnodes from "./rules-removed/no-comment-textnodes";
6968
import noComplexConditionalRendering from "./rules-removed/no-complex-conditional-rendering";
7069
import preferReactNamespaceImport from "./rules-removed/prefer-react-namespace-import";
7170
import preferShorthandBoolean from "./rules-removed/prefer-shorthand-boolean";
7271
import preferShorthandFragment from "./rules-removed/prefer-shorthand-fragment";
73-
/* eslint-enable perfectionist/sort-imports */
7472

7573
export const plugin = {
7674
meta: {

0 commit comments

Comments
 (0)