Commit 848e0e3

Browse files
potetopoteto
authored
[eprh] Update plugin config to be compatible with flat and legacy (#34762)
This has been incredibly frustrating as [ESLint's own docs](https://eslint.org/docs/latest/extend/plugins#backwards-compatibility-for-legacy-configs) are clearly wrong (see #34679). This PR uses [eslint-plugin-react's setup](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/index.js) as a reference, where the presets are assigned to `configs.flat` (not documented by eslint).
1 parent 5c15c1c commit 848e0e3

4 files changed

Lines changed: 63 additions & 56 deletions

File tree

‎fixtures/eslint-v9/eslint.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'eslint/config';
22
importreactHooksfrom'eslint-plugin-react-hooks';
33

44
exportdefaultdefineConfig([
5+
reactHooks.configs.flat['recommended-latest'],
56
{
67
languageOptions: {
78
ecmaVersion: 'latest',
@@ -12,7 +13,6 @@ export default defineConfig([
1213
},
1314
},
1415
},
15-
extends: [reactHooks.configs['recommended-latest']],
1616
rules: {
1717
'react-hooks/exhaustive-deps': 'error',
1818
},

‎packages/eslint-plugin-react-hooks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@babel/preset-typescript": "^7.26.0",
5151
"@babel/types": "^7.19.0",
5252
"@tsconfig/strictest": "^2.0.5",
53-
"@types/eslint": "^8.56.12",
53+
"@types/eslint": "^9.6.1",
5454
"@types/estree": "^1.0.6",
5555
"@types/estree-jsx": "^1.0.5",
5656
"@types/node": "^20.2.5",

‎packages/eslint-plugin-react-hooks/src/index.ts‎

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
}from'./shared/ReactCompiler';
1515
importRulesOfHooksfrom'./rules/RulesOfHooks';
1616

17-
// All rules
1817
construles={
1918
'exhaustive-deps': ExhaustiveDeps,
2019
'rules-of-hooks': RulesOfHooks,
@@ -23,7 +22,6 @@ const rules = {
2322
),
2423
}satisfiesRecord<string,Rule.RuleModule>;
2524

26-
// Basic hooks rules (for recommended config)
2725
constbasicRuleConfigs={
2826
'react-hooks/rules-of-hooks': 'error',
2927
'react-hooks/exhaustive-deps': 'warn',
@@ -38,74 +36,71 @@ const compilerRuleConfigs = Object.fromEntries(
3836
}),
3937
)asRecord<`react-hooks/${string}`,Linter.RuleEntry>;
4038

41-
// All rules including compiler rules (for recommended-latest config)
4239
constallRuleConfigs: Linter.RulesRecord={
4340
...basicRuleConfigs,
4441
...compilerRuleConfigs,
4542
};
4643

47-
typeFlatConfig={
44+
constplugins=['react-hooks'];
45+
46+
typeReactHooksFlatConfig={
4847
plugins: Record<string,any>;
4948
rules: Linter.RulesRecord;
5049
};
5150

51+
constconfigs={
52+
'recommended-legacy': {
53+
plugins,
54+
rules: basicRuleConfigs,
55+
},
56+
'recommended-latest-legacy': {
57+
plugins,
58+
rules: allRuleConfigs,
59+
},
60+
'flat/recommended': {
61+
plugins,
62+
rules: basicRuleConfigs,
63+
},
64+
'recommended-latest': {
65+
plugins,
66+
rules: allRuleConfigs,
67+
},
68+
recommended: {
69+
plugins,
70+
rules: basicRuleConfigs,
71+
},
72+
flat: {}asRecord<string,ReactHooksFlatConfig>,
73+
};
74+
5275
constplugin={
5376
meta: {
5477
name: 'eslint-plugin-react-hooks',
5578
},
5679
rules,
57-
configs: {}as{
58-
'recommended-legacy': {
59-
plugins: Array<string>;
60-
rules: Linter.RulesRecord;
61-
};
62-
'recommended-latest-legacy': {
63-
plugins: Array<string>;
64-
rules: Linter.RulesRecord;
65-
};
66-
'flat/recommended': Array<FlatConfig>;
67-
'recommended-latest': Array<FlatConfig>;
68-
recommended: Array<FlatConfig>;
69-
},
80+
configs,
7081
};
7182

72-
Object.assign(plugin.configs,{
83+
Object.assign(configs.flat,{
7384
'recommended-legacy': {
74-
plugins: ['react-hooks'],
75-
rules: basicRuleConfigs,
85+
plugins: {'react-hooks': plugin},
86+
rules: configs['recommended-legacy'].rules,
7687
},
77-
7888
'recommended-latest-legacy': {
79-
plugins: ['react-hooks'],
80-
rules: allRuleConfigs,
89+
plugins: {'react-hooks': plugin},
90+
rules: configs['recommended-latest-legacy'].rules,
91+
},
92+
'flat/recommended': {
93+
plugins: {'react-hooks': plugin},
94+
rules: configs['flat/recommended'].rules,
95+
},
96+
'recommended-latest': {
97+
plugins: {'react-hooks': plugin},
98+
rules: configs['recommended-latest'].rules,
99+
},
100+
recommended: {
101+
plugins: {'react-hooks': plugin},
102+
rules: configs.recommended.rules,
81103
},
82-
83-
'flat/recommended': [
84-
{
85-
plugins: {
86-
'react-hooks': plugin,
87-
},
88-
rules: basicRuleConfigs,
89-
},
90-
],
91-
92-
'recommended-latest': [
93-
{
94-
plugins: {
95-
'react-hooks': plugin,
96-
},
97-
rules: allRuleConfigs,
98-
},
99-
],
100-
101-
recommended: [
102-
{
103-
plugins: {
104-
'react-hooks': plugin,
105-
},
106-
rules: basicRuleConfigs,
107-
},
108-
],
109104
});
110105

111106
exportdefaultplugin;

‎yarn.lock‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@
39073907
"@types/estree" "*"
39083908
"@types/json-schema" "*"
39093909

3910-
"@types/eslint@^8.56.12":
3911-
version "8.56.12"
3912-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a"
3913-
integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==
3910+
"@types/eslint@^9.6.1":
3911+
version "9.6.1"
3912+
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
3913+
integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
39143914
dependencies:
39153915
"@types/estree" "*"
39163916
"@types/json-schema" "*"
@@ -10190,6 +10190,11 @@ hermes-eslint@^0.32.0:
1019010190
hermes-estree "0.32.0"
1019110191
hermes-parser "0.32.0"
1019210192

10193+
hermes-estree@0.25.1:
10194+
version "0.25.1"
10195+
resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
10196+
integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
10197+
1019310198
hermes-estree@0.29.1:
1019410199
version "0.29.1"
1019510200
resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5"
@@ -10214,6 +10219,13 @@ hermes-parser@0.32.0, hermes-parser@^0.32.0:
1021410219
dependencies:
1021510220
hermes-estree "0.32.0"
1021610221

10222+
hermes-parser@^0.25.1:
10223+
version "0.25.1"
10224+
resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
10225+
integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
10226+
dependencies:
10227+
hermes-estree "0.25.1"
10228+
1021710229
homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
1021810230
version "1.0.3"
1021910231
resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 848e0e3
Browse files
potetopoteto
authored
[eprh] Update plugin config to be compatible with flat and legacy (#34762)
This has been incredibly frustrating as [ESLint's own
docs](https://eslint.org/docs/latest/extend/plugins#backwards-compatibility-for-legacy-configs)
are clearly wrong (see #34679).
This PR uses [eslint-plugin-react's
setup](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/index.js)
as a reference, where the presets are assigned to `configs.flat` (not
documented by eslint).
1 parent 5c15c1c commit 848e0e3
4 files changed
Lines changed: 63 additions & 56 deletions
File tree
‎fixtures/eslint-v9/eslint.config.ts‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'eslint/config';
22
importreactHooksfrom'eslint-plugin-react-hooks';
33

44
exportdefaultdefineConfig([
5+
reactHooks.configs.flat['recommended-latest'],
56
{
67
languageOptions: {
78
ecmaVersion: 'latest',
@@ -12,7 +13,6 @@ export default defineConfig([
1213
},
1314
},
1415
},
15-
extends: [reactHooks.configs['recommended-latest']],
1616
rules: {
1717
'react-hooks/exhaustive-deps': 'error',
1818
},
‎packages/eslint-plugin-react-hooks/package.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@babel/preset-typescript": "^7.26.0",
5151
"@babel/types": "^7.19.0",
5252
"@tsconfig/strictest": "^2.0.5",
53-
"@types/eslint": "^8.56.12",
53+
"@types/eslint": "^9.6.1",
5454
"@types/estree": "^1.0.6",
5555
"@types/estree-jsx": "^1.0.5",
5656
"@types/node": "^20.2.5",
‎packages/eslint-plugin-react-hooks/src/index.ts‎
Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
}from'./shared/ReactCompiler';
1515
importRulesOfHooksfrom'./rules/RulesOfHooks';
1616

17-
// All rules
1817
construles={
1918
'exhaustive-deps': ExhaustiveDeps,
2019
'rules-of-hooks': RulesOfHooks,
@@ -23,7 +22,6 @@ const rules = {
2322
),
2423
}satisfiesRecord<string,Rule.RuleModule>;
2524

26-
// Basic hooks rules (for recommended config)
2725
constbasicRuleConfigs={
2826
'react-hooks/rules-of-hooks': 'error',
2927
'react-hooks/exhaustive-deps': 'warn',
@@ -38,74 +36,71 @@ const compilerRuleConfigs = Object.fromEntries(
3836
}),
3937
)asRecord<`react-hooks/${string}`,Linter.RuleEntry>;
4038

41-
// All rules including compiler rules (for recommended-latest config)
4239
constallRuleConfigs: Linter.RulesRecord={
4340
 ...basicRuleConfigs,
4441
 ...compilerRuleConfigs,
4542
};
4643

47-
typeFlatConfig={
44+
constplugins=['react-hooks'];
45+
46+
typeReactHooksFlatConfig={
4847
plugins: Record<string,any>;
4948
rules: Linter.RulesRecord;
5049
};
5150

51+
constconfigs={
52+
'recommended-legacy': {
53+
 plugins,
54+
rules: basicRuleConfigs,
55+
},
56+
'recommended-latest-legacy': {
57+
 plugins,
58+
rules: allRuleConfigs,
59+
},
60+
'flat/recommended': {
61+
 plugins,
62+
rules: basicRuleConfigs,
63+
},
64+
'recommended-latest': {
65+
 plugins,
66+
rules: allRuleConfigs,
67+
},
68+
recommended: {
69+
 plugins,
70+
rules: basicRuleConfigs,
71+
},
72+
flat: {}asRecord<string,ReactHooksFlatConfig>,
73+
};
74+
5275
constplugin={
5376
meta: {
5477
name: 'eslint-plugin-react-hooks',
5578
},
5679
 rules,
57-
configs: {}as{
58-
'recommended-legacy': {
59-
plugins: Array<string>;
60-
rules: Linter.RulesRecord;
61-
};
62-
'recommended-latest-legacy': {
63-
plugins: Array<string>;
64-
rules: Linter.RulesRecord;
65-
};
66-
'flat/recommended': Array<FlatConfig>;
67-
'recommended-latest': Array<FlatConfig>;
68-
recommended: Array<FlatConfig>;
69-
},
80+
 configs,
7081
};
7182

72-
Object.assign(plugin.configs,{
83+
Object.assign(configs.flat,{
7384
'recommended-legacy': {
74-
plugins: ['react-hooks'],
75-
rules: basicRuleConfigs,
85+
plugins: {'react-hooks': plugin},
86+
rules: configs['recommended-legacy'].rules,
7687
},
77-
7888
'recommended-latest-legacy': {
79-
plugins: ['react-hooks'],
80-
rules: allRuleConfigs,
89+
plugins: {'react-hooks': plugin},
90+
rules: configs['recommended-latest-legacy'].rules,
91+
},
92+
'flat/recommended': {
93+
plugins: {'react-hooks': plugin},
94+
rules: configs['flat/recommended'].rules,
95+
},
96+
'recommended-latest': {
97+
plugins: {'react-hooks': plugin},
98+
rules: configs['recommended-latest'].rules,
99+
},
100+
recommended: {
101+
plugins: {'react-hooks': plugin},
102+
rules: configs.recommended.rules,
81103
},
82-
83-
'flat/recommended': [
84-
{
85-
plugins: {
86-
'react-hooks': plugin,
87-
},
88-
rules: basicRuleConfigs,
89-
},
90-
],
91-
92-
'recommended-latest': [
93-
{
94-
plugins: {
95-
'react-hooks': plugin,
96-
},
97-
rules: allRuleConfigs,
98-
},
99-
],
100-
101-
recommended: [
102-
{
103-
plugins: {
104-
'react-hooks': plugin,
105-
},
106-
rules: basicRuleConfigs,
107-
},
108-
],
109104
});
110105

111106
exportdefaultplugin;
‎yarn.lock‎
Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@
39073907
 "@types/estree" "*"
39083908
 "@types/json-schema" "*"
39093909

3910-
"@types/eslint@^8.56.12":
3911-
 version "8.56.12"
3912-
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a"
3913-
 integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==
3910+
"@types/eslint@^9.6.1":
3911+
 version "9.6.1"
3912+
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
3913+
 integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
39143914
 dependencies:
39153915
 "@types/estree" "*"
39163916
 "@types/json-schema" "*"
@@ -10190,6 +10190,11 @@ hermes-eslint@^0.32.0:
1019010190
 hermes-estree "0.32.0"
1019110191
 hermes-parser "0.32.0"
1019210192

10193+
hermes-estree@0.25.1:
10194+
 version "0.25.1"
10195+
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
10196+
 integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
10197+
1019310198
hermes-estree@0.29.1:
1019410199
 version "0.29.1"
1019510200
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5"
@@ -10214,6 +10219,13 @@ hermes-parser@0.32.0, hermes-parser@^0.32.0:
1021410219
 dependencies:
1021510220
 hermes-estree "0.32.0"
1021610221

10222+
hermes-parser@^0.25.1:
10223+
 version "0.25.1"
10224+
 resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
10225+
 integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
10226+
 dependencies:
10227+
 hermes-estree "0.25.1"
10228+
1021710229
homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
1021810230
 version "1.0.3"
1021910231
 resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 848e0e3
Browse files
potetopoteto
authored
[eprh] Update plugin config to be compatible with flat and legacy (#34762)
This has been incredibly frustrating as [ESLint's own
docs](https://eslint.org/docs/latest/extend/plugins#backwards-compatibility-for-legacy-configs)
are clearly wrong (see #34679).
This PR uses [eslint-plugin-react's
setup](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/index.js)
as a reference, where the presets are assigned to `configs.flat` (not
documented by eslint).
1 parent 5c15c1c commit 848e0e3
4 files changed
Lines changed: 63 additions & 56 deletions
File tree
‎fixtures/eslint-v9/eslint.config.ts‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'eslint/config';
22
importreactHooksfrom'eslint-plugin-react-hooks';
33

44
exportdefaultdefineConfig([
5+
reactHooks.configs.flat['recommended-latest'],
56
{
67
languageOptions: {
78
ecmaVersion: 'latest',
@@ -12,7 +13,6 @@ export default defineConfig([
1213
},
1314
},
1415
},
15-
extends: [reactHooks.configs['recommended-latest']],
1616
rules: {
1717
'react-hooks/exhaustive-deps': 'error',
1818
},
‎packages/eslint-plugin-react-hooks/package.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@babel/preset-typescript": "^7.26.0",
5151
"@babel/types": "^7.19.0",
5252
"@tsconfig/strictest": "^2.0.5",
53-
"@types/eslint": "^8.56.12",
53+
"@types/eslint": "^9.6.1",
5454
"@types/estree": "^1.0.6",
5555
"@types/estree-jsx": "^1.0.5",
5656
"@types/node": "^20.2.5",
‎packages/eslint-plugin-react-hooks/src/index.ts‎
Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
}from'./shared/ReactCompiler';
1515
importRulesOfHooksfrom'./rules/RulesOfHooks';
1616

17-
// All rules
1817
construles={
1918
'exhaustive-deps': ExhaustiveDeps,
2019
'rules-of-hooks': RulesOfHooks,
@@ -23,7 +22,6 @@ const rules = {
2322
),
2423
}satisfiesRecord<string,Rule.RuleModule>;
2524

26-
// Basic hooks rules (for recommended config)
2725
constbasicRuleConfigs={
2826
'react-hooks/rules-of-hooks': 'error',
2927
'react-hooks/exhaustive-deps': 'warn',
@@ -38,74 +36,71 @@ const compilerRuleConfigs = Object.fromEntries(
3836
}),
3937
)asRecord<`react-hooks/${string}`,Linter.RuleEntry>;
4038

41-
// All rules including compiler rules (for recommended-latest config)
4239
constallRuleConfigs: Linter.RulesRecord={
4340
 ...basicRuleConfigs,
4441
 ...compilerRuleConfigs,
4542
};
4643

47-
typeFlatConfig={
44+
constplugins=['react-hooks'];
45+
46+
typeReactHooksFlatConfig={
4847
plugins: Record<string,any>;
4948
rules: Linter.RulesRecord;
5049
};
5150

51+
constconfigs={
52+
'recommended-legacy': {
53+
 plugins,
54+
rules: basicRuleConfigs,
55+
},
56+
'recommended-latest-legacy': {
57+
 plugins,
58+
rules: allRuleConfigs,
59+
},
60+
'flat/recommended': {
61+
 plugins,
62+
rules: basicRuleConfigs,
63+
},
64+
'recommended-latest': {
65+
 plugins,
66+
rules: allRuleConfigs,
67+
},
68+
recommended: {
69+
 plugins,
70+
rules: basicRuleConfigs,
71+
},
72+
flat: {}asRecord<string,ReactHooksFlatConfig>,
73+
};
74+
5275
constplugin={
5376
meta: {
5477
name: 'eslint-plugin-react-hooks',
5578
},
5679
 rules,
57-
configs: {}as{
58-
'recommended-legacy': {
59-
plugins: Array<string>;
60-
rules: Linter.RulesRecord;
61-
};
62-
'recommended-latest-legacy': {
63-
plugins: Array<string>;
64-
rules: Linter.RulesRecord;
65-
};
66-
'flat/recommended': Array<FlatConfig>;
67-
'recommended-latest': Array<FlatConfig>;
68-
recommended: Array<FlatConfig>;
69-
},
80+
 configs,
7081
};
7182

72-
Object.assign(plugin.configs,{
83+
Object.assign(configs.flat,{
7384
'recommended-legacy': {
74-
plugins: ['react-hooks'],
75-
rules: basicRuleConfigs,
85+
plugins: {'react-hooks': plugin},
86+
rules: configs['recommended-legacy'].rules,
7687
},
77-
7888
'recommended-latest-legacy': {
79-
plugins: ['react-hooks'],
80-
rules: allRuleConfigs,
89+
plugins: {'react-hooks': plugin},
90+
rules: configs['recommended-latest-legacy'].rules,
91+
},
92+
'flat/recommended': {
93+
plugins: {'react-hooks': plugin},
94+
rules: configs['flat/recommended'].rules,
95+
},
96+
'recommended-latest': {
97+
plugins: {'react-hooks': plugin},
98+
rules: configs['recommended-latest'].rules,
99+
},
100+
recommended: {
101+
plugins: {'react-hooks': plugin},
102+
rules: configs.recommended.rules,
81103
},
82-
83-
'flat/recommended': [
84-
{
85-
plugins: {
86-
'react-hooks': plugin,
87-
},
88-
rules: basicRuleConfigs,
89-
},
90-
],
91-
92-
'recommended-latest': [
93-
{
94-
plugins: {
95-
'react-hooks': plugin,
96-
},
97-
rules: allRuleConfigs,
98-
},
99-
],
100-
101-
recommended: [
102-
{
103-
plugins: {
104-
'react-hooks': plugin,
105-
},
106-
rules: basicRuleConfigs,
107-
},
108-
],
109104
});
110105

111106
exportdefaultplugin;
‎yarn.lock‎
Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@
39073907
 "@types/estree" "*"
39083908
 "@types/json-schema" "*"
39093909

3910-
"@types/eslint@^8.56.12":
3911-
 version "8.56.12"
3912-
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a"
3913-
 integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==
3910+
"@types/eslint@^9.6.1":
3911+
 version "9.6.1"
3912+
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
3913+
 integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
39143914
 dependencies:
39153915
 "@types/estree" "*"
39163916
 "@types/json-schema" "*"
@@ -10190,6 +10190,11 @@ hermes-eslint@^0.32.0:
1019010190
 hermes-estree "0.32.0"
1019110191
 hermes-parser "0.32.0"
1019210192

10193+
hermes-estree@0.25.1:
10194+
 version "0.25.1"
10195+
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
10196+
 integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
10197+
1019310198
hermes-estree@0.29.1:
1019410199
 version "0.29.1"
1019510200
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5"
@@ -10214,6 +10219,13 @@ hermes-parser@0.32.0, hermes-parser@^0.32.0:
1021410219
 dependencies:
1021510220
 hermes-estree "0.32.0"
1021610221

10222+
hermes-parser@^0.25.1:
10223+
 version "0.25.1"
10224+
 resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
10225+
 integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
10226+
 dependencies:
10227+
 hermes-estree "0.25.1"
10228+
1021710229
homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
1021810230
 version "1.0.3"
1021910231
 resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 848e0e3
Browse files
potetopoteto
authored
[eprh] Update plugin config to be compatible with flat and legacy (#34762)
This has been incredibly frustrating as [ESLint's own
docs](https://eslint.org/docs/latest/extend/plugins#backwards-compatibility-for-legacy-configs)
are clearly wrong (see #34679).
This PR uses [eslint-plugin-react's
setup](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/index.js)
as a reference, where the presets are assigned to `configs.flat` (not
documented by eslint).
1 parent 5c15c1c commit 848e0e3
4 files changed
Lines changed: 63 additions & 56 deletions
File tree
‎fixtures/eslint-v9/eslint.config.ts‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'eslint/config';
22
importreactHooksfrom'eslint-plugin-react-hooks';
33

44
exportdefaultdefineConfig([
5+
reactHooks.configs.flat['recommended-latest'],
56
{
67
languageOptions: {
78
ecmaVersion: 'latest',
@@ -12,7 +13,6 @@ export default defineConfig([
1213
},
1314
},
1415
},
15-
extends: [reactHooks.configs['recommended-latest']],
1616
rules: {
1717
'react-hooks/exhaustive-deps': 'error',
1818
},
‎packages/eslint-plugin-react-hooks/package.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@babel/preset-typescript": "^7.26.0",
5151
"@babel/types": "^7.19.0",
5252
"@tsconfig/strictest": "^2.0.5",
53-
"@types/eslint": "^8.56.12",
53+
"@types/eslint": "^9.6.1",
5454
"@types/estree": "^1.0.6",
5555
"@types/estree-jsx": "^1.0.5",
5656
"@types/node": "^20.2.5",
‎packages/eslint-plugin-react-hooks/src/index.ts‎
Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
}from'./shared/ReactCompiler';
1515
importRulesOfHooksfrom'./rules/RulesOfHooks';
1616

17-
// All rules
1817
construles={
1918
'exhaustive-deps': ExhaustiveDeps,
2019
'rules-of-hooks': RulesOfHooks,
@@ -23,7 +22,6 @@ const rules = {
2322
),
2423
}satisfiesRecord<string,Rule.RuleModule>;
2524

26-
// Basic hooks rules (for recommended config)
2725
constbasicRuleConfigs={
2826
'react-hooks/rules-of-hooks': 'error',
2927
'react-hooks/exhaustive-deps': 'warn',
@@ -38,74 +36,71 @@ const compilerRuleConfigs = Object.fromEntries(
3836
}),
3937
)asRecord<`react-hooks/${string}`,Linter.RuleEntry>;
4038

41-
// All rules including compiler rules (for recommended-latest config)
4239
constallRuleConfigs: Linter.RulesRecord={
4340
 ...basicRuleConfigs,
4441
 ...compilerRuleConfigs,
4542
};
4643

47-
typeFlatConfig={
44+
constplugins=['react-hooks'];
45+
46+
typeReactHooksFlatConfig={
4847
plugins: Record<string,any>;
4948
rules: Linter.RulesRecord;
5049
};
5150

51+
constconfigs={
52+
'recommended-legacy': {
53+
 plugins,
54+
rules: basicRuleConfigs,
55+
},
56+
'recommended-latest-legacy': {
57+
 plugins,
58+
rules: allRuleConfigs,
59+
},
60+
'flat/recommended': {
61+
 plugins,
62+
rules: basicRuleConfigs,
63+
},
64+
'recommended-latest': {
65+
 plugins,
66+
rules: allRuleConfigs,
67+
},
68+
recommended: {
69+
 plugins,
70+
rules: basicRuleConfigs,
71+
},
72+
flat: {}asRecord<string,ReactHooksFlatConfig>,
73+
};
74+
5275
constplugin={
5376
meta: {
5477
name: 'eslint-plugin-react-hooks',
5578
},
5679
 rules,
57-
configs: {}as{
58-
'recommended-legacy': {
59-
plugins: Array<string>;
60-
rules: Linter.RulesRecord;
61-
};
62-
'recommended-latest-legacy': {
63-
plugins: Array<string>;
64-
rules: Linter.RulesRecord;
65-
};
66-
'flat/recommended': Array<FlatConfig>;
67-
'recommended-latest': Array<FlatConfig>;
68-
recommended: Array<FlatConfig>;
69-
},
80+
 configs,
7081
};
7182

72-
Object.assign(plugin.configs,{
83+
Object.assign(configs.flat,{
7384
'recommended-legacy': {
74-
plugins: ['react-hooks'],
75-
rules: basicRuleConfigs,
85+
plugins: {'react-hooks': plugin},
86+
rules: configs['recommended-legacy'].rules,
7687
},
77-
7888
'recommended-latest-legacy': {
79-
plugins: ['react-hooks'],
80-
rules: allRuleConfigs,
89+
plugins: {'react-hooks': plugin},
90+
rules: configs['recommended-latest-legacy'].rules,
91+
},
92+
'flat/recommended': {
93+
plugins: {'react-hooks': plugin},
94+
rules: configs['flat/recommended'].rules,
95+
},
96+
'recommended-latest': {
97+
plugins: {'react-hooks': plugin},
98+
rules: configs['recommended-latest'].rules,
99+
},
100+
recommended: {
101+
plugins: {'react-hooks': plugin},
102+
rules: configs.recommended.rules,
81103
},
82-
83-
'flat/recommended': [
84-
{
85-
plugins: {
86-
'react-hooks': plugin,
87-
},
88-
rules: basicRuleConfigs,
89-
},
90-
],
91-
92-
'recommended-latest': [
93-
{
94-
plugins: {
95-
'react-hooks': plugin,
96-
},
97-
rules: allRuleConfigs,
98-
},
99-
],
100-
101-
recommended: [
102-
{
103-
plugins: {
104-
'react-hooks': plugin,
105-
},
106-
rules: basicRuleConfigs,
107-
},
108-
],
109104
});
110105

111106
exportdefaultplugin;
‎yarn.lock‎
Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@
39073907
 "@types/estree" "*"
39083908
 "@types/json-schema" "*"
39093909

3910-
"@types/eslint@^8.56.12":
3911-
 version "8.56.12"
3912-
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a"
3913-
 integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==
3910+
"@types/eslint@^9.6.1":
3911+
 version "9.6.1"
3912+
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
3913+
 integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
39143914
 dependencies:
39153915
 "@types/estree" "*"
39163916
 "@types/json-schema" "*"
@@ -10190,6 +10190,11 @@ hermes-eslint@^0.32.0:
1019010190
 hermes-estree "0.32.0"
1019110191
 hermes-parser "0.32.0"
1019210192

10193+
hermes-estree@0.25.1:
10194+
 version "0.25.1"
10195+
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
10196+
 integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
10197+
1019310198
hermes-estree@0.29.1:
1019410199
 version "0.29.1"
1019510200
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5"
@@ -10214,6 +10219,13 @@ hermes-parser@0.32.0, hermes-parser@^0.32.0:
1021410219
 dependencies:
1021510220
 hermes-estree "0.32.0"
1021610221

10222+
hermes-parser@^0.25.1:
10223+
 version "0.25.1"
10224+
 resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
10225+
 integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
10226+
 dependencies:
10227+
 hermes-estree "0.25.1"
10228+
1021710229
homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
1021810230
 version "1.0.3"
1021910231
 resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 848e0e3
Browse files
potetopoteto
authored
[eprh] Update plugin config to be compatible with flat and legacy (#34762)
This has been incredibly frustrating as [ESLint's own
docs](https://eslint.org/docs/latest/extend/plugins#backwards-compatibility-for-legacy-configs)
are clearly wrong (see #34679).
This PR uses [eslint-plugin-react's
setup](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/index.js)
as a reference, where the presets are assigned to `configs.flat` (not
documented by eslint).
1 parent 5c15c1c commit 848e0e3
4 files changed
Lines changed: 63 additions & 56 deletions
File tree
‎fixtures/eslint-v9/eslint.config.ts‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'eslint/config';
22
importreactHooksfrom'eslint-plugin-react-hooks';
33

44
exportdefaultdefineConfig([
5+
reactHooks.configs.flat['recommended-latest'],
56
{
67
languageOptions: {
78
ecmaVersion: 'latest',
@@ -12,7 +13,6 @@ export default defineConfig([
1213
},
1314
},
1415
},
15-
extends: [reactHooks.configs['recommended-latest']],
1616
rules: {
1717
'react-hooks/exhaustive-deps': 'error',
1818
},
‎packages/eslint-plugin-react-hooks/package.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@babel/preset-typescript": "^7.26.0",
5151
"@babel/types": "^7.19.0",
5252
"@tsconfig/strictest": "^2.0.5",
53-
"@types/eslint": "^8.56.12",
53+
"@types/eslint": "^9.6.1",
5454
"@types/estree": "^1.0.6",
5555
"@types/estree-jsx": "^1.0.5",
5656
"@types/node": "^20.2.5",
‎packages/eslint-plugin-react-hooks/src/index.ts‎
Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
}from'./shared/ReactCompiler';
1515
importRulesOfHooksfrom'./rules/RulesOfHooks';
1616

17-
// All rules
1817
construles={
1918
'exhaustive-deps': ExhaustiveDeps,
2019
'rules-of-hooks': RulesOfHooks,
@@ -23,7 +22,6 @@ const rules = {
2322
),
2423
}satisfiesRecord<string,Rule.RuleModule>;
2524

26-
// Basic hooks rules (for recommended config)
2725
constbasicRuleConfigs={
2826
'react-hooks/rules-of-hooks': 'error',
2927
'react-hooks/exhaustive-deps': 'warn',
@@ -38,74 +36,71 @@ const compilerRuleConfigs = Object.fromEntries(
3836
}),
3937
)asRecord<`react-hooks/${string}`,Linter.RuleEntry>;
4038

41-
// All rules including compiler rules (for recommended-latest config)
4239
constallRuleConfigs: Linter.RulesRecord={
4340
 ...basicRuleConfigs,
4441
 ...compilerRuleConfigs,
4542
};
4643

47-
typeFlatConfig={
44+
constplugins=['react-hooks'];
45+
46+
typeReactHooksFlatConfig={
4847
plugins: Record<string,any>;
4948
rules: Linter.RulesRecord;
5049
};
5150

51+
constconfigs={
52+
'recommended-legacy': {
53+
 plugins,
54+
rules: basicRuleConfigs,
55+
},
56+
'recommended-latest-legacy': {
57+
 plugins,
58+
rules: allRuleConfigs,
59+
},
60+
'flat/recommended': {
61+
 plugins,
62+
rules: basicRuleConfigs,
63+
},
64+
'recommended-latest': {
65+
 plugins,
66+
rules: allRuleConfigs,
67+
},
68+
recommended: {
69+
 plugins,
70+
rules: basicRuleConfigs,
71+
},
72+
flat: {}asRecord<string,ReactHooksFlatConfig>,
73+
};
74+
5275
constplugin={
5376
meta: {
5477
name: 'eslint-plugin-react-hooks',
5578
},
5679
 rules,
57-
configs: {}as{
58-
'recommended-legacy': {
59-
plugins: Array<string>;
60-
rules: Linter.RulesRecord;
61-
};
62-
'recommended-latest-legacy': {
63-
plugins: Array<string>;
64-
rules: Linter.RulesRecord;
65-
};
66-
'flat/recommended': Array<FlatConfig>;
67-
'recommended-latest': Array<FlatConfig>;
68-
recommended: Array<FlatConfig>;
69-
},
80+
 configs,
7081
};
7182

72-
Object.assign(plugin.configs,{
83+
Object.assign(configs.flat,{
7384
'recommended-legacy': {
74-
plugins: ['react-hooks'],
75-
rules: basicRuleConfigs,
85+
plugins: {'react-hooks': plugin},
86+
rules: configs['recommended-legacy'].rules,
7687
},
77-
7888
'recommended-latest-legacy': {
79-
plugins: ['react-hooks'],
80-
rules: allRuleConfigs,
89+
plugins: {'react-hooks': plugin},
90+
rules: configs['recommended-latest-legacy'].rules,
91+
},
92+
'flat/recommended': {
93+
plugins: {'react-hooks': plugin},
94+
rules: configs['flat/recommended'].rules,
95+
},
96+
'recommended-latest': {
97+
plugins: {'react-hooks': plugin},
98+
rules: configs['recommended-latest'].rules,
99+
},
100+
recommended: {
101+
plugins: {'react-hooks': plugin},
102+
rules: configs.recommended.rules,
81103
},
82-
83-
'flat/recommended': [
84-
{
85-
plugins: {
86-
'react-hooks': plugin,
87-
},
88-
rules: basicRuleConfigs,
89-
},
90-
],
91-
92-
'recommended-latest': [
93-
{
94-
plugins: {
95-
'react-hooks': plugin,
96-
},
97-
rules: allRuleConfigs,
98-
},
99-
],
100-
101-
recommended: [
102-
{
103-
plugins: {
104-
'react-hooks': plugin,
105-
},
106-
rules: basicRuleConfigs,
107-
},
108-
],
109104
});
110105

111106
exportdefaultplugin;
‎yarn.lock‎
Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@
39073907
 "@types/estree" "*"
39083908
 "@types/json-schema" "*"
39093909

3910-
"@types/eslint@^8.56.12":
3911-
 version "8.56.12"
3912-
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a"
3913-
 integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==
3910+
"@types/eslint@^9.6.1":
3911+
 version "9.6.1"
3912+
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
3913+
 integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
39143914
 dependencies:
39153915
 "@types/estree" "*"
39163916
 "@types/json-schema" "*"
@@ -10190,6 +10190,11 @@ hermes-eslint@^0.32.0:
1019010190
 hermes-estree "0.32.0"
1019110191
 hermes-parser "0.32.0"
1019210192

10193+
hermes-estree@0.25.1:
10194+
 version "0.25.1"
10195+
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
10196+
 integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
10197+
1019310198
hermes-estree@0.29.1:
1019410199
 version "0.29.1"
1019510200
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5"
@@ -10214,6 +10219,13 @@ hermes-parser@0.32.0, hermes-parser@^0.32.0:
1021410219
 dependencies:
1021510220
 hermes-estree "0.32.0"
1021610221

10222+
hermes-parser@^0.25.1:
10223+
 version "0.25.1"
10224+
 resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
10225+
 integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
10226+
 dependencies:
10227+
 hermes-estree "0.25.1"
10228+
1021710229
homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
1021810230
 version "1.0.3"
1021910231
 resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 848e0e3
Browse files
potetopoteto
authored
[eprh] Update plugin config to be compatible with flat and legacy (#34762)
This has been incredibly frustrating as [ESLint's own
docs](https://eslint.org/docs/latest/extend/plugins#backwards-compatibility-for-legacy-configs)
are clearly wrong (see #34679).
This PR uses [eslint-plugin-react's
setup](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/index.js)
as a reference, where the presets are assigned to `configs.flat` (not
documented by eslint).
1 parent 5c15c1c commit 848e0e3
4 files changed
Lines changed: 63 additions & 56 deletions
File tree
‎fixtures/eslint-v9/eslint.config.ts‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'eslint/config';
22
importreactHooksfrom'eslint-plugin-react-hooks';
33

44
exportdefaultdefineConfig([
5+
reactHooks.configs.flat['recommended-latest'],
56
{
67
languageOptions: {
78
ecmaVersion: 'latest',
@@ -12,7 +13,6 @@ export default defineConfig([
1213
},
1314
},
1415
},
15-
extends: [reactHooks.configs['recommended-latest']],
1616
rules: {
1717
'react-hooks/exhaustive-deps': 'error',
1818
},
‎packages/eslint-plugin-react-hooks/package.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@babel/preset-typescript": "^7.26.0",
5151
"@babel/types": "^7.19.0",
5252
"@tsconfig/strictest": "^2.0.5",
53-
"@types/eslint": "^8.56.12",
53+
"@types/eslint": "^9.6.1",
5454
"@types/estree": "^1.0.6",
5555
"@types/estree-jsx": "^1.0.5",
5656
"@types/node": "^20.2.5",
‎packages/eslint-plugin-react-hooks/src/index.ts‎
Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
}from'./shared/ReactCompiler';
1515
importRulesOfHooksfrom'./rules/RulesOfHooks';
1616

17-
// All rules
1817
construles={
1918
'exhaustive-deps': ExhaustiveDeps,
2019
'rules-of-hooks': RulesOfHooks,
@@ -23,7 +22,6 @@ const rules = {
2322
),
2423
}satisfiesRecord<string,Rule.RuleModule>;
2524

26-
// Basic hooks rules (for recommended config)
2725
constbasicRuleConfigs={
2826
'react-hooks/rules-of-hooks': 'error',
2927
'react-hooks/exhaustive-deps': 'warn',
@@ -38,74 +36,71 @@ const compilerRuleConfigs = Object.fromEntries(
3836
}),
3937
)asRecord<`react-hooks/${string}`,Linter.RuleEntry>;
4038

41-
// All rules including compiler rules (for recommended-latest config)
4239
constallRuleConfigs: Linter.RulesRecord={
4340
 ...basicRuleConfigs,
4441
 ...compilerRuleConfigs,
4542
};
4643

47-
typeFlatConfig={
44+
constplugins=['react-hooks'];
45+
46+
typeReactHooksFlatConfig={
4847
plugins: Record<string,any>;
4948
rules: Linter.RulesRecord;
5049
};
5150

51+
constconfigs={
52+
'recommended-legacy': {
53+
 plugins,
54+
rules: basicRuleConfigs,
55+
},
56+
'recommended-latest-legacy': {
57+
 plugins,
58+
rules: allRuleConfigs,
59+
},
60+
'flat/recommended': {
61+
 plugins,
62+
rules: basicRuleConfigs,
63+
},
64+
'recommended-latest': {
65+
 plugins,
66+
rules: allRuleConfigs,
67+
},
68+
recommended: {
69+
 plugins,
70+
rules: basicRuleConfigs,
71+
},
72+
flat: {}asRecord<string,ReactHooksFlatConfig>,
73+
};
74+
5275
constplugin={
5376
meta: {
5477
name: 'eslint-plugin-react-hooks',
5578
},
5679
 rules,
57-
configs: {}as{
58-
'recommended-legacy': {
59-
plugins: Array<string>;
60-
rules: Linter.RulesRecord;
61-
};
62-
'recommended-latest-legacy': {
63-
plugins: Array<string>;
64-
rules: Linter.RulesRecord;
65-
};
66-
'flat/recommended': Array<FlatConfig>;
67-
'recommended-latest': Array<FlatConfig>;
68-
recommended: Array<FlatConfig>;
69-
},
80+
 configs,
7081
};
7182

72-
Object.assign(plugin.configs,{
83+
Object.assign(configs.flat,{
7384
'recommended-legacy': {
74-
plugins: ['react-hooks'],
75-
rules: basicRuleConfigs,
85+
plugins: {'react-hooks': plugin},
86+
rules: configs['recommended-legacy'].rules,
7687
},
77-
7888
'recommended-latest-legacy': {
79-
plugins: ['react-hooks'],
80-
rules: allRuleConfigs,
89+
plugins: {'react-hooks': plugin},
90+
rules: configs['recommended-latest-legacy'].rules,
91+
},
92+
'flat/recommended': {
93+
plugins: {'react-hooks': plugin},
94+
rules: configs['flat/recommended'].rules,
95+
},
96+
'recommended-latest': {
97+
plugins: {'react-hooks': plugin},
98+
rules: configs['recommended-latest'].rules,
99+
},
100+
recommended: {
101+
plugins: {'react-hooks': plugin},
102+
rules: configs.recommended.rules,
81103
},
82-
83-
'flat/recommended': [
84-
{
85-
plugins: {
86-
'react-hooks': plugin,
87-
},
88-
rules: basicRuleConfigs,
89-
},
90-
],
91-
92-
'recommended-latest': [
93-
{
94-
plugins: {
95-
'react-hooks': plugin,
96-
},
97-
rules: allRuleConfigs,
98-
},
99-
],
100-
101-
recommended: [
102-
{
103-
plugins: {
104-
'react-hooks': plugin,
105-
},
106-
rules: basicRuleConfigs,
107-
},
108-
],
109104
});
110105

111106
exportdefaultplugin;
‎yarn.lock‎
Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@
39073907
 "@types/estree" "*"
39083908
 "@types/json-schema" "*"
39093909

3910-
"@types/eslint@^8.56.12":
3911-
 version "8.56.12"
3912-
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a"
3913-
 integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==
3910+
"@types/eslint@^9.6.1":
3911+
 version "9.6.1"
3912+
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
3913+
 integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
39143914
 dependencies:
39153915
 "@types/estree" "*"
39163916
 "@types/json-schema" "*"
@@ -10190,6 +10190,11 @@ hermes-eslint@^0.32.0:
1019010190
 hermes-estree "0.32.0"
1019110191
 hermes-parser "0.32.0"
1019210192

10193+
hermes-estree@0.25.1:
10194+
 version "0.25.1"
10195+
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
10196+
 integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
10197+
1019310198
hermes-estree@0.29.1:
1019410199
 version "0.29.1"
1019510200
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5"
@@ -10214,6 +10219,13 @@ hermes-parser@0.32.0, hermes-parser@^0.32.0:
1021410219
 dependencies:
1021510220
 hermes-estree "0.32.0"
1021610221

10222+
hermes-parser@^0.25.1:
10223+
 version "0.25.1"
10224+
 resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
10225+
 integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
10226+
 dependencies:
10227+
 hermes-estree "0.25.1"
10228+
1021710229
homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
1021810230
 version "1.0.3"
1021910231
 resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 848e0e3
Browse files
potetopoteto
authored
[eprh] Update plugin config to be compatible with flat and legacy (#34762)
This has been incredibly frustrating as [ESLint's own
docs](https://eslint.org/docs/latest/extend/plugins#backwards-compatibility-for-legacy-configs)
are clearly wrong (see #34679).
This PR uses [eslint-plugin-react's
setup](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/index.js)
as a reference, where the presets are assigned to `configs.flat` (not
documented by eslint).
1 parent 5c15c1c commit 848e0e3
4 files changed
Lines changed: 63 additions & 56 deletions
File tree
‎fixtures/eslint-v9/eslint.config.ts‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'eslint/config';
22
importreactHooksfrom'eslint-plugin-react-hooks';
33

44
exportdefaultdefineConfig([
5+
reactHooks.configs.flat['recommended-latest'],
56
{
67
languageOptions: {
78
ecmaVersion: 'latest',
@@ -12,7 +13,6 @@ export default defineConfig([
1213
},
1314
},
1415
},
15-
extends: [reactHooks.configs['recommended-latest']],
1616
rules: {
1717
'react-hooks/exhaustive-deps': 'error',
1818
},
‎packages/eslint-plugin-react-hooks/package.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@babel/preset-typescript": "^7.26.0",
5151
"@babel/types": "^7.19.0",
5252
"@tsconfig/strictest": "^2.0.5",
53-
"@types/eslint": "^8.56.12",
53+
"@types/eslint": "^9.6.1",
5454
"@types/estree": "^1.0.6",
5555
"@types/estree-jsx": "^1.0.5",
5656
"@types/node": "^20.2.5",
‎packages/eslint-plugin-react-hooks/src/index.ts‎
Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
}from'./shared/ReactCompiler';
1515
importRulesOfHooksfrom'./rules/RulesOfHooks';
1616

17-
// All rules
1817
construles={
1918
'exhaustive-deps': ExhaustiveDeps,
2019
'rules-of-hooks': RulesOfHooks,
@@ -23,7 +22,6 @@ const rules = {
2322
),
2423
}satisfiesRecord<string,Rule.RuleModule>;
2524

26-
// Basic hooks rules (for recommended config)
2725
constbasicRuleConfigs={
2826
'react-hooks/rules-of-hooks': 'error',
2927
'react-hooks/exhaustive-deps': 'warn',
@@ -38,74 +36,71 @@ const compilerRuleConfigs = Object.fromEntries(
3836
}),
3937
)asRecord<`react-hooks/${string}`,Linter.RuleEntry>;
4038

41-
// All rules including compiler rules (for recommended-latest config)
4239
constallRuleConfigs: Linter.RulesRecord={
4340
 ...basicRuleConfigs,
4441
 ...compilerRuleConfigs,
4542
};
4643

47-
typeFlatConfig={
44+
constplugins=['react-hooks'];
45+
46+
typeReactHooksFlatConfig={
4847
plugins: Record<string,any>;
4948
rules: Linter.RulesRecord;
5049
};
5150

51+
constconfigs={
52+
'recommended-legacy': {
53+
 plugins,
54+
rules: basicRuleConfigs,
55+
},
56+
'recommended-latest-legacy': {
57+
 plugins,
58+
rules: allRuleConfigs,
59+
},
60+
'flat/recommended': {
61+
 plugins,
62+
rules: basicRuleConfigs,
63+
},
64+
'recommended-latest': {
65+
 plugins,
66+
rules: allRuleConfigs,
67+
},
68+
recommended: {
69+
 plugins,
70+
rules: basicRuleConfigs,
71+
},
72+
flat: {}asRecord<string,ReactHooksFlatConfig>,
73+
};
74+
5275
constplugin={
5376
meta: {
5477
name: 'eslint-plugin-react-hooks',
5578
},
5679
 rules,
57-
configs: {}as{
58-
'recommended-legacy': {
59-
plugins: Array<string>;
60-
rules: Linter.RulesRecord;
61-
};
62-
'recommended-latest-legacy': {
63-
plugins: Array<string>;
64-
rules: Linter.RulesRecord;
65-
};
66-
'flat/recommended': Array<FlatConfig>;
67-
'recommended-latest': Array<FlatConfig>;
68-
recommended: Array<FlatConfig>;
69-
},
80+
 configs,
7081
};
7182

72-
Object.assign(plugin.configs,{
83+
Object.assign(configs.flat,{
7384
'recommended-legacy': {
74-
plugins: ['react-hooks'],
75-
rules: basicRuleConfigs,
85+
plugins: {'react-hooks': plugin},
86+
rules: configs['recommended-legacy'].rules,
7687
},
77-
7888
'recommended-latest-legacy': {
79-
plugins: ['react-hooks'],
80-
rules: allRuleConfigs,
89+
plugins: {'react-hooks': plugin},
90+
rules: configs['recommended-latest-legacy'].rules,
91+
},
92+
'flat/recommended': {
93+
plugins: {'react-hooks': plugin},
94+
rules: configs['flat/recommended'].rules,
95+
},
96+
'recommended-latest': {
97+
plugins: {'react-hooks': plugin},
98+
rules: configs['recommended-latest'].rules,
99+
},
100+
recommended: {
101+
plugins: {'react-hooks': plugin},
102+
rules: configs.recommended.rules,
81103
},
82-
83-
'flat/recommended': [
84-
{
85-
plugins: {
86-
'react-hooks': plugin,
87-
},
88-
rules: basicRuleConfigs,
89-
},
90-
],
91-
92-
'recommended-latest': [
93-
{
94-
plugins: {
95-
'react-hooks': plugin,
96-
},
97-
rules: allRuleConfigs,
98-
},
99-
],
100-
101-
recommended: [
102-
{
103-
plugins: {
104-
'react-hooks': plugin,
105-
},
106-
rules: basicRuleConfigs,
107-
},
108-
],
109104
});
110105

111106
exportdefaultplugin;
‎yarn.lock‎
Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@
39073907
 "@types/estree" "*"
39083908
 "@types/json-schema" "*"
39093909

3910-
"@types/eslint@^8.56.12":
3911-
 version "8.56.12"
3912-
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a"
3913-
 integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==
3910+
"@types/eslint@^9.6.1":
3911+
 version "9.6.1"
3912+
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
3913+
 integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
39143914
 dependencies:
39153915
 "@types/estree" "*"
39163916
 "@types/json-schema" "*"
@@ -10190,6 +10190,11 @@ hermes-eslint@^0.32.0:
1019010190
 hermes-estree "0.32.0"
1019110191
 hermes-parser "0.32.0"
1019210192

10193+
hermes-estree@0.25.1:
10194+
 version "0.25.1"
10195+
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
10196+
 integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
10197+
1019310198
hermes-estree@0.29.1:
1019410199
 version "0.29.1"
1019510200
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5"
@@ -10214,6 +10219,13 @@ hermes-parser@0.32.0, hermes-parser@^0.32.0:
1021410219
 dependencies:
1021510220
 hermes-estree "0.32.0"
1021610221

10222+
hermes-parser@^0.25.1:
10223+
 version "0.25.1"
10224+
 resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
10225+
 integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
10226+
 dependencies:
10227+
 hermes-estree "0.25.1"
10228+
1021710229
homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
1021810230
 version "1.0.3"
1021910231
 resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 848e0e3
Browse files
potetopoteto
authored
[eprh] Update plugin config to be compatible with flat and legacy (#34762)
This has been incredibly frustrating as [ESLint's own
docs](https://eslint.org/docs/latest/extend/plugins#backwards-compatibility-for-legacy-configs)
are clearly wrong (see #34679).
This PR uses [eslint-plugin-react's
setup](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/index.js)
as a reference, where the presets are assigned to `configs.flat` (not
documented by eslint).
1 parent 5c15c1c commit 848e0e3
4 files changed
Lines changed: 63 additions & 56 deletions
File tree
‎fixtures/eslint-v9/eslint.config.ts‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'eslint/config';
22
importreactHooksfrom'eslint-plugin-react-hooks';
33

44
exportdefaultdefineConfig([
5+
reactHooks.configs.flat['recommended-latest'],
56
{
67
languageOptions: {
78
ecmaVersion: 'latest',
@@ -12,7 +13,6 @@ export default defineConfig([
1213
},
1314
},
1415
},
15-
extends: [reactHooks.configs['recommended-latest']],
1616
rules: {
1717
'react-hooks/exhaustive-deps': 'error',
1818
},
‎packages/eslint-plugin-react-hooks/package.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@babel/preset-typescript": "^7.26.0",
5151
"@babel/types": "^7.19.0",
5252
"@tsconfig/strictest": "^2.0.5",
53-
"@types/eslint": "^8.56.12",
53+
"@types/eslint": "^9.6.1",
5454
"@types/estree": "^1.0.6",
5555
"@types/estree-jsx": "^1.0.5",
5656
"@types/node": "^20.2.5",
‎packages/eslint-plugin-react-hooks/src/index.ts‎
Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
}from'./shared/ReactCompiler';
1515
importRulesOfHooksfrom'./rules/RulesOfHooks';
1616

17-
// All rules
1817
construles={
1918
'exhaustive-deps': ExhaustiveDeps,
2019
'rules-of-hooks': RulesOfHooks,
@@ -23,7 +22,6 @@ const rules = {
2322
),
2423
}satisfiesRecord<string,Rule.RuleModule>;
2524

26-
// Basic hooks rules (for recommended config)
2725
constbasicRuleConfigs={
2826
'react-hooks/rules-of-hooks': 'error',
2927
'react-hooks/exhaustive-deps': 'warn',
@@ -38,74 +36,71 @@ const compilerRuleConfigs = Object.fromEntries(
3836
}),
3937
)asRecord<`react-hooks/${string}`,Linter.RuleEntry>;
4038

41-
// All rules including compiler rules (for recommended-latest config)
4239
constallRuleConfigs: Linter.RulesRecord={
4340
 ...basicRuleConfigs,
4441
 ...compilerRuleConfigs,
4542
};
4643

47-
typeFlatConfig={
44+
constplugins=['react-hooks'];
45+
46+
typeReactHooksFlatConfig={
4847
plugins: Record<string,any>;
4948
rules: Linter.RulesRecord;
5049
};
5150

51+
constconfigs={
52+
'recommended-legacy': {
53+
 plugins,
54+
rules: basicRuleConfigs,
55+
},
56+
'recommended-latest-legacy': {
57+
 plugins,
58+
rules: allRuleConfigs,
59+
},
60+
'flat/recommended': {
61+
 plugins,
62+
rules: basicRuleConfigs,
63+
},
64+
'recommended-latest': {
65+
 plugins,
66+
rules: allRuleConfigs,
67+
},
68+
recommended: {
69+
 plugins,
70+
rules: basicRuleConfigs,
71+
},
72+
flat: {}asRecord<string,ReactHooksFlatConfig>,
73+
};
74+
5275
constplugin={
5376
meta: {
5477
name: 'eslint-plugin-react-hooks',
5578
},
5679
 rules,
57-
configs: {}as{
58-
'recommended-legacy': {
59-
plugins: Array<string>;
60-
rules: Linter.RulesRecord;
61-
};
62-
'recommended-latest-legacy': {
63-
plugins: Array<string>;
64-
rules: Linter.RulesRecord;
65-
};
66-
'flat/recommended': Array<FlatConfig>;
67-
'recommended-latest': Array<FlatConfig>;
68-
recommended: Array<FlatConfig>;
69-
},
80+
 configs,
7081
};
7182

72-
Object.assign(plugin.configs,{
83+
Object.assign(configs.flat,{
7384
'recommended-legacy': {
74-
plugins: ['react-hooks'],
75-
rules: basicRuleConfigs,
85+
plugins: {'react-hooks': plugin},
86+
rules: configs['recommended-legacy'].rules,
7687
},
77-
7888
'recommended-latest-legacy': {
79-
plugins: ['react-hooks'],
80-
rules: allRuleConfigs,
89+
plugins: {'react-hooks': plugin},
90+
rules: configs['recommended-latest-legacy'].rules,
91+
},
92+
'flat/recommended': {
93+
plugins: {'react-hooks': plugin},
94+
rules: configs['flat/recommended'].rules,
95+
},
96+
'recommended-latest': {
97+
plugins: {'react-hooks': plugin},
98+
rules: configs['recommended-latest'].rules,
99+
},
100+
recommended: {
101+
plugins: {'react-hooks': plugin},
102+
rules: configs.recommended.rules,
81103
},
82-
83-
'flat/recommended': [
84-
{
85-
plugins: {
86-
'react-hooks': plugin,
87-
},
88-
rules: basicRuleConfigs,
89-
},
90-
],
91-
92-
'recommended-latest': [
93-
{
94-
plugins: {
95-
'react-hooks': plugin,
96-
},
97-
rules: allRuleConfigs,
98-
},
99-
],
100-
101-
recommended: [
102-
{
103-
plugins: {
104-
'react-hooks': plugin,
105-
},
106-
rules: basicRuleConfigs,
107-
},
108-
],
109104
});
110105

111106
exportdefaultplugin;
‎yarn.lock‎
Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@
39073907
 "@types/estree" "*"
39083908
 "@types/json-schema" "*"
39093909

3910-
"@types/eslint@^8.56.12":
3911-
 version "8.56.12"
3912-
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a"
3913-
 integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==
3910+
"@types/eslint@^9.6.1":
3911+
 version "9.6.1"
3912+
 resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
3913+
 integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
39143914
 dependencies:
39153915
 "@types/estree" "*"
39163916
 "@types/json-schema" "*"
@@ -10190,6 +10190,11 @@ hermes-eslint@^0.32.0:
1019010190
 hermes-estree "0.32.0"
1019110191
 hermes-parser "0.32.0"
1019210192

10193+
hermes-estree@0.25.1:
10194+
 version "0.25.1"
10195+
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
10196+
 integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
10197+
1019310198
hermes-estree@0.29.1:
1019410199
 version "0.29.1"
1019510200
 resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5"
@@ -10214,6 +10219,13 @@ hermes-parser@0.32.0, hermes-parser@^0.32.0:
1021410219
 dependencies:
1021510220
 hermes-estree "0.32.0"
1021610221

10222+
hermes-parser@^0.25.1:
10223+
 version "0.25.1"
10224+
 resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
10225+
 integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
10226+
 dependencies:
10227+
 hermes-estree "0.25.1"
10228+
1021710229
homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
1021810230
 version "1.0.3"
1021910231
 resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
0 commit comments
Comments
 (0)