Skip to content

Commit 3d1ffee

Browse files
graceparkgracepark
authored
Merge pull request #602 from github/update-escompat
Update naming of plugins
2 parents 3f4c461 + bc44e01 commit 3d1ffee

5 files changed

Lines changed: 40 additions & 41 deletions

File tree

‎eslint.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ module.exports = [
2121
},
2222
plugins: {
2323
eslintPlugin,
24-
importPlugin,
24+
import: importPlugin,
2525
'i18n-text': fixupPluginRules(i18nTextPlugin),
2626
},
2727
rules: {
28-
'importPlugin/extensions': 'off',
29-
'importPlugin/no-commonjs': 'off',
28+
'import/extensions': 'off',
29+
'import/no-commonjs': 'off',
3030
'github/filenames-match-regex': 'off',
3131
'i18n-text/no-en': 'off',
3232
'eslint-plugin/prefer-placeholders': 'off',

‎lib/configs/flat/browser.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
const globals = require('globals')
22
const github = require('../../plugin')
33
const importPlugin = require('eslint-plugin-import')
4-
const escompatPlugin = require('eslint-plugin-escompat')
4+
const escompat = require('eslint-plugin-escompat')
55
const {fixupPluginRules} = require('@eslint/compat')
66

77
module.exports = {
8-
...escompatPlugin.configs['flat/recommended'],
8+
...escompat.configs['flat/recommended'],
99
languageOptions: {
1010
globals: {
1111
...globals.browser,
1212
},
1313
},
14-
plugins: {importPlugin, escompatPlugin, github: fixupPluginRules(github)},
14+
plugins: {import: importPlugin, escompat, github: fixupPluginRules(github)},
1515
rules: {
16-
'escompatPlugin/no-dynamic-imports': 'off',
16+
'escompat/no-dynamic-imports': 'off',
1717
'github/async-currenttarget': 'error',
1818
'github/async-preventdefault': 'error',
1919
'github/get-attribute': 'error',
@@ -25,7 +25,7 @@ module.exports = {
2525
'github/no-useless-passive': 'error',
2626
'github/require-passive-events': 'error',
2727
'github/prefer-observers': 'error',
28-
'importPlugin/no-nodejs-modules': 'error',
28+
'import/no-nodejs-modules': 'error',
2929
'no-restricted-syntax': [
3030
'error',
3131
{

‎lib/configs/flat/react.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ module.exports = {
1212
},
1313
},
1414
},
15-
plugins: {github: fixupPluginRules(github), jsxA11yPlugin},
15+
plugins: {github: fixupPluginRules(github), 'jsx-a11y': jsxA11yPlugin},
1616
rules: {
17-
'jsxA11yPlugin/role-supports-aria-props': 'off', // Override with github/a11y-role-supports-aria-props until https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/issues/910 is resolved
17+
'jsx-a11y/role-supports-aria-props': 'off', // Override with github/a11y-role-supports-aria-props until https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/issues/910 is resolved
1818
'github/a11y-aria-label-is-well-formatted': 'error',
1919
'github/a11y-no-visually-hidden-interactive-element': 'error',
2020
'github/a11y-no-title-attribute': 'error',
2121
'github/a11y-svg-has-accessible-name': 'error',
2222
'github/a11y-role-supports-aria-props': 'error',
23-
'jsxA11yPlugin/no-aria-hidden-on-focusable': 'error',
24-
'jsxA11yPlugin/no-autofocus': 'off',
25-
'jsxA11yPlugin/anchor-ambiguous-text': [
23+
'jsx-a11y/no-aria-hidden-on-focusable': 'error',
24+
'jsx-a11y/no-autofocus': 'off',
25+
'jsx-a11y/anchor-ambiguous-text': [
2626
'error',
2727
{
2828
words: ['this', 'more', 'read here', 'read more'],
2929
},
3030
],
31-
'jsxA11yPlugin/no-interactive-element-to-noninteractive-role': [
31+
'jsx-a11y/no-interactive-element-to-noninteractive-role': [
3232
'error',
3333
{
3434
tr: ['none', 'presentation'],
3535
td: ['cell'], // TODO: Remove once https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/pull/937#issuecomment-1638128318 is addressed.
3636
canvas: ['img'],
3737
},
3838
],
39-
'jsxA11yPlugin/no-redundant-roles': [
39+
'jsx-a11y/no-redundant-roles': [
4040
'error',
4141
{
4242
nav: ['navigation'], // default in eslint-plugin-jsx-a11y

‎lib/configs/flat/recommended.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
plugins: {
1919
prettierPlugin,
2020
eslintComments,
21-
importPlugin,
21+
import: importPlugin,
2222
'i18n-text': fixupPluginRules(i18nTextPlugin),
2323
noOnlyTestsPlugin,
2424
github: fixupPluginRules(github),
@@ -39,15 +39,15 @@ module.exports = {
3939
'github/no-then': 'error',
4040
'github/no-dynamic-script-tag': 'error',
4141
'i18n-text/no-en': ['error'],
42-
'importPlugin/default': 'error',
43-
'importPlugin/export': 'error',
44-
'importPlugin/extensions': 'error',
45-
'importPlugin/first': 'error',
46-
'importPlugin/named': 'error',
47-
'importPlugin/namespace': 'error',
48-
'importPlugin/no-absolute-path': 'error',
49-
'importPlugin/no-amd': 'error',
50-
'importPlugin/no-anonymous-default-export': [
42+
'import/default': 'error',
43+
'import/export': 'error',
44+
'import/extensions': 'error',
45+
'import/first': 'error',
46+
'import/named': 'error',
47+
'import/namespace': 'error',
48+
'import/no-absolute-path': 'error',
49+
'import/no-amd': 'error',
50+
'import/no-anonymous-default-export': [
5151
'error',
5252
{
5353
allowAnonymousClass: false,
@@ -58,17 +58,17 @@ module.exports = {
5858
allowObject: true,
5959
},
6060
],
61-
'importPlugin/no-commonjs': 'error',
62-
'importPlugin/no-deprecated': 'error',
63-
'importPlugin/no-duplicates': 'error',
64-
'importPlugin/no-dynamic-require': 'error',
65-
'importPlugin/no-extraneous-dependencies': [0, {devDependencies: false}],
66-
'importPlugin/no-mutable-exports': 'error',
67-
'importPlugin/no-named-as-default': 'error',
68-
'importPlugin/no-named-as-default-member': 'error',
69-
'importPlugin/no-namespace': 'error',
70-
'importPlugin/no-unresolved': 'error',
71-
'importPlugin/no-webpack-loader-syntax': 'error',
61+
'import/no-commonjs': 'error',
62+
'import/no-deprecated': 'error',
63+
'import/no-duplicates': 'error',
64+
'import/no-dynamic-require': 'error',
65+
'import/no-extraneous-dependencies': [0, {devDependencies: false}],
66+
'import/no-mutable-exports': 'error',
67+
'import/no-named-as-default': 'error',
68+
'import/no-named-as-default-member': 'error',
69+
'import/no-namespace': 'error',
70+
'import/no-unresolved': 'error',
71+
'import/no-webpack-loader-syntax': 'error',
7272
'no-case-declarations': 'error',
7373
'no-class-assign': 'error',
7474
'no-compare-neg-zero': 'error',
@@ -139,7 +139,7 @@ module.exports = {
139139
eqeqeq: ['error', 'smart'],
140140
},
141141
settings: {
142-
'importPlugin/resolver': {
142+
'import/resolver': {
143143
node: {
144144
extensions: ['.js', '.ts'],
145145
},

‎lib/configs/flat/typescript.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
const eslint = require('@eslint/js')
21
const tseslint = require('typescript-eslint')
3-
const escompatPlugin = require('eslint-plugin-escompat')
2+
const escompat = require('eslint-plugin-escompat')
43
const github = require('../../plugin')
54
const {fixupPluginRules} = require('@eslint/compat')
65

7-
module.exports = tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended, {
6+
module.exports = tseslint.config(...tseslint.configs.recommended, ...escompat.configs['flat/typescript-2020'], {
87
languageOptions: {
98
parser: tseslint.parser,
109
},
11-
plugins: {'@typescript-eslint': tseslint.plugin, escompatPlugin, github: fixupPluginRules(github)},
10+
plugins: {'@typescript-eslint': tseslint.plugin, escompat, github: fixupPluginRules(github)},
1211
rules: {
1312
camelcase: 'off',
1413
'no-unused-vars': 'off',

0 commit comments

Comments
 (0)