-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[New] export flat configs from plugin root and fix flat config crash
Co-authored-by: Brad Zacher <[email protected]> Co-authored-by: Milos Djermanovic <[email protected]>
- Loading branch information
Showing
25 changed files
with
386 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,13 @@ | ||
| 'use strict'; | ||
|
|
||
| const fromEntries = require('object.fromentries'); | ||
| const entries = require('object.entries'); | ||
| const plugin = require('..'); | ||
|
|
||
| const allRules = require('../lib/rules'); | ||
|
|
||
| function filterRules(rules, predicate) { | ||
| return fromEntries(entries(rules).filter((entry) => predicate(entry[1]))); | ||
| } | ||
|
|
||
| /** | ||
| * @param {object} rules - rules object mapping rule name to rule module | ||
| * @returns {Record<string, 2>} | ||
| */ | ||
| function configureAsError(rules) { | ||
| return fromEntries(Object.keys(rules).map((key) => [`react/${key}`, 2])); | ||
| } | ||
|
|
||
| const activeRules = filterRules(allRules, (rule) => !rule.meta.deprecated); | ||
| const activeRulesConfig = configureAsError(activeRules); | ||
|
|
||
| const deprecatedRules = filterRules(allRules, (rule) => rule.meta.deprecated); | ||
| const legacyConfig = plugin.configs.all; | ||
|
|
||
| module.exports = { | ||
| plugins: { | ||
| /** | ||
| * @type {{ | ||
| * deprecatedRules: Record<string, import('eslint').Rule.RuleModule>, | ||
| * rules: Record<string, import('eslint').Rule.RuleModule>, | ||
| * }} | ||
| */ | ||
| react: { | ||
| deprecatedRules, | ||
| rules: allRules, | ||
| }, | ||
| }, | ||
| rules: activeRulesConfig, | ||
| languageOptions: { | ||
| parserOptions: { | ||
| ecmaFeatures: { | ||
| jsx: true, | ||
| }, | ||
| }, | ||
| }, | ||
| plugins: { react: plugin }, | ||
| rules: legacyConfig.rules, | ||
| languageOptions: { parserOptions: legacyConfig.parserOptions }, | ||
| }; | ||
|
|
||
| // this is so the `languageOptions` property won't be warned in the new config system | ||
| Object.defineProperty(module.exports, 'languageOptions', { enumerable: false }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,13 @@ | ||
| 'use strict'; | ||
|
|
||
| const all = require('./all'); | ||
| const plugin = require('..'); | ||
|
|
||
| module.exports = Object.assign({}, all, { | ||
| languageOptions: Object.assign({}, all.languageOptions, { | ||
| parserOptions: Object.assign({}, all.languageOptions.parserOptions, { | ||
| jsxPragma: null, // for @typescript/eslint-parser | ||
| }), | ||
| }), | ||
| rules: { | ||
| 'react/react-in-jsx-scope': 0, | ||
| 'react/jsx-uses-react': 0, | ||
| }, | ||
| }); | ||
| const legacyConfig = plugin.configs['jsx-runtime']; | ||
|
|
||
| module.exports = { | ||
| plugins: { react: plugin }, | ||
| rules: legacyConfig.rules, | ||
| languageOptions: { parserOptions: legacyConfig.parserOptions }, | ||
| }; | ||
|
|
||
| // this is so the `languageOptions` property won't be warned in the new config system | ||
| Object.defineProperty(module.exports, 'languageOptions', { enumerable: false }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,13 @@ | ||
| 'use strict'; | ||
|
|
||
| const all = require('./all'); | ||
| const plugin = require('..'); | ||
|
|
||
| module.exports = Object.assign({}, all, { | ||
| languageOptions: all.languageOptions, | ||
| rules: { | ||
| 'react/display-name': 2, | ||
| 'react/jsx-key': 2, | ||
| 'react/jsx-no-comment-textnodes': 2, | ||
| 'react/jsx-no-duplicate-props': 2, | ||
| 'react/jsx-no-target-blank': 2, | ||
| 'react/jsx-no-undef': 2, | ||
| 'react/jsx-uses-react': 2, | ||
| 'react/jsx-uses-vars': 2, | ||
| 'react/no-children-prop': 2, | ||
| 'react/no-danger-with-children': 2, | ||
| 'react/no-deprecated': 2, | ||
| 'react/no-direct-mutation-state': 2, | ||
| 'react/no-find-dom-node': 2, | ||
| 'react/no-is-mounted': 2, | ||
| 'react/no-render-return-value': 2, | ||
| 'react/no-string-refs': 2, | ||
| 'react/no-unescaped-entities': 2, | ||
| 'react/no-unknown-property': 2, | ||
| 'react/no-unsafe': 0, | ||
| 'react/prop-types': 2, | ||
| 'react/react-in-jsx-scope': 2, | ||
| 'react/require-render-return': 2, | ||
| }, | ||
| }); | ||
| const legacyConfig = plugin.configs.recommended; | ||
|
|
||
| module.exports = { | ||
| plugins: { react: plugin }, | ||
| rules: legacyConfig.rules, | ||
| languageOptions: { parserOptions: legacyConfig.parserOptions }, | ||
| }; | ||
|
|
||
| // this is so the `languageOptions` property won't be warned in the new config system | ||
| Object.defineProperty(module.exports, 'languageOptions', { enumerable: false }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,109 @@ | ||
| 'use strict'; | ||
|
|
||
| const configAll = require('./configs/all'); | ||
| const configRecommended = require('./configs/recommended'); | ||
| const configRuntime = require('./configs/jsx-runtime'); | ||
| const fromEntries = require('object.fromentries'); | ||
| const entries = require('object.entries'); | ||
|
|
||
| const allRules = require('./lib/rules'); | ||
|
|
||
| function filterRules(rules, predicate) { | ||
| return fromEntries(entries(rules).filter((entry) => predicate(entry[1]))); | ||
| } | ||
|
|
||
| /** | ||
| * @param {object} rules - rules object mapping rule name to rule module | ||
| * @returns {Record<string, 2>} | ||
| */ | ||
| function configureAsError(rules) { | ||
| return fromEntries(Object.keys(rules).map((key) => [`react/${key}`, 2])); | ||
| } | ||
|
|
||
| const activeRules = filterRules(allRules, (rule) => !rule.meta.deprecated); | ||
| const activeRulesConfig = configureAsError(activeRules); | ||
|
|
||
| const deprecatedRules = filterRules(allRules, (rule) => rule.meta.deprecated); | ||
|
|
||
| // for legacy config system | ||
| const plugins = [ | ||
| 'react', | ||
| ]; | ||
|
|
||
| module.exports = { | ||
| deprecatedRules: configAll.plugins.react.deprecatedRules, | ||
| const plugin = { | ||
| deprecatedRules, | ||
| rules: allRules, | ||
| configs: { | ||
| recommended: Object.assign({}, configRecommended, { | ||
| parserOptions: configRecommended.languageOptions.parserOptions, | ||
| recommended: { | ||
| plugins, | ||
| }), | ||
| all: Object.assign({}, configAll, { | ||
| parserOptions: configAll.languageOptions.parserOptions, | ||
| parserOptions: { | ||
| ecmaFeatures: { | ||
| jsx: true, | ||
| }, | ||
| }, | ||
| rules: { | ||
| 'react/display-name': 2, | ||
| 'react/jsx-key': 2, | ||
| 'react/jsx-no-comment-textnodes': 2, | ||
| 'react/jsx-no-duplicate-props': 2, | ||
| 'react/jsx-no-target-blank': 2, | ||
| 'react/jsx-no-undef': 2, | ||
| 'react/jsx-uses-react': 2, | ||
| 'react/jsx-uses-vars': 2, | ||
| 'react/no-children-prop': 2, | ||
| 'react/no-danger-with-children': 2, | ||
| 'react/no-deprecated': 2, | ||
| 'react/no-direct-mutation-state': 2, | ||
| 'react/no-find-dom-node': 2, | ||
| 'react/no-is-mounted': 2, | ||
| 'react/no-render-return-value': 2, | ||
| 'react/no-string-refs': 2, | ||
| 'react/no-unescaped-entities': 2, | ||
| 'react/no-unknown-property': 2, | ||
| 'react/no-unsafe': 0, | ||
| 'react/prop-types': 2, | ||
| 'react/react-in-jsx-scope': 2, | ||
| 'react/require-render-return': 2, | ||
| }, | ||
| }, | ||
| all: { | ||
| plugins, | ||
| }), | ||
| 'jsx-runtime': Object.assign({}, configRuntime, { | ||
| parserOptions: configRuntime.languageOptions.parserOptions, | ||
| parserOptions: { | ||
| ecmaFeatures: { | ||
| jsx: true, | ||
| }, | ||
| }, | ||
| rules: activeRulesConfig, | ||
| }, | ||
| 'jsx-runtime': { | ||
| plugins, | ||
| }), | ||
| parserOptions: { | ||
| ecmaFeatures: { | ||
| jsx: true, | ||
| }, | ||
| jsxPragma: null, // for @typescript/eslint-parser | ||
| }, | ||
| rules: { | ||
| 'react/react-in-jsx-scope': 0, | ||
| 'react/jsx-uses-react': 0, | ||
| }, | ||
| }, | ||
| }, | ||
| }; | ||
|
|
||
| plugin.configs.flat = { | ||
| recommended: { | ||
| plugins: { react: plugin }, | ||
| rules: plugin.configs.recommended.rules, | ||
| languageOptions: { parserOptions: plugin.configs.recommended.parserOptions }, | ||
| }, | ||
| all: { | ||
| plugins: { react: plugin }, | ||
| rules: plugin.configs.all.rules, | ||
| languageOptions: { parserOptions: plugin.configs.all.parserOptions }, | ||
| }, | ||
| 'jsx-runtime': { | ||
| plugins: { react: plugin }, | ||
| rules: plugin.configs['jsx-runtime'].rules, | ||
| languageOptions: { parserOptions: plugin.configs['jsx-runtime'].parserOptions }, | ||
| }, | ||
| }; | ||
|
|
||
| module.exports = plugin; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
tests/fixtures/flat-config/config-all/eslint.config-deep.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| 'use strict'; | ||
|
|
||
| const reactAll = require('../../../../configs/all'); | ||
|
|
||
| module.exports = [{ | ||
| files: ['**/*.jsx'], | ||
| ...reactAll, | ||
| languageOptions: { | ||
| ...reactAll.languageOptions | ||
| } | ||
| }]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| 'use strict'; | ||
|
|
||
| const reactPlugin = require('../../../..'); | ||
|
|
||
| module.exports = [{ | ||
| files: ['**/*.jsx'], | ||
| ...reactPlugin.configs.flat.all | ||
| }]; |
Oops, something went wrong.