Skip to content

Commit e331138

Browse files
committed
feat: re-export flat configs "flat/*"
long-time plan: v6: no action v7: rename 'flat/*' => '*'; eslintrc config '*' => 'legacy/*'? v8~: remove eslintrc supports
1 parent f4d8cb1 commit e331138

8 files changed

+54
-43
lines changed

configs/all-type-checked.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
/**
2+
* @deprecated use 'flat/all-type-checked' instead
3+
* @author 唯然<[email protected]>
4+
*/
15
'use strict';
26

3-
const mod = require('../lib/index.js');
7+
const plugin = require('../lib/index.js');
48

5-
module.exports = {
6-
plugins: { 'eslint-plugin': mod },
7-
rules: mod.configs['all-type-checked'].rules,
8-
};
9+
module.exports = plugin.configs['flat/all-type-checked']

configs/all.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/**
22
* @fileoverview the `all` config for `eslint.config.js`
3+
* @deprecated use 'flat/all' instead
34
* @author 唯然<[email protected]>
45
*/
56

67
'use strict';
78

8-
const mod = require('../lib/index.js');
9+
const plugin = require('../lib/index.js');
910

10-
module.exports = {
11-
plugins: { 'eslint-plugin': mod },
12-
rules: mod.configs.all.rules,
13-
};
11+
module.exports = plugin.configs['flat/all']

configs/recommended.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/**
22
* @fileoverview the `recommended` config for `eslint.config.js`
3+
* @deprecated use 'flat/recommended' instead
34
* @author 唯然<[email protected]>
45
*/
56

67
'use strict';
78

8-
const mod = require('../lib/index.js');
9+
const plugin = require('../lib/index.js');
910

10-
module.exports = {
11-
plugins: { 'eslint-plugin': mod },
12-
rules: mod.configs.recommended.rules,
13-
};
11+
module.exports = plugin.configs['flat/recommended']

configs/rules-recommended.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/**
22
* @fileoverview the `rules-recommended` config for `eslint.config.js`
3+
* @deprecated use 'flat/rules-recommended' instead
34
* @author 唯然<[email protected]>
45
*/
56

67
'use strict';
78

8-
const mod = require('../lib/index.js');
9+
const plugin = require('../lib/index.js');
910

10-
module.exports = {
11-
plugins: { 'eslint-plugin': mod },
12-
rules: mod.configs['rules-recommended'].rules,
13-
};
11+
module.exports = plugin.configs['flat/rules-recommended']

configs/rules.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/**
22
* @fileoverview the `rules` config for `eslint.config.js`
3+
* @deprecated use 'flat/rules' instead
34
* @author 唯然<[email protected]>
45
*/
56

67
'use strict';
78

8-
const mod = require('../lib/index.js');
9+
const plugin = require('../lib/index.js');
910

10-
module.exports = {
11-
plugins: { 'eslint-plugin': mod },
12-
rules: mod.configs.rules.rules,
13-
};
11+
module.exports = plugin.configs['flat/rules']

configs/tests-recommended.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/**
22
* @fileoverview the `tests-recommended` config for `eslint.config.js`
3+
* @deprecated use 'flat/tests-recommended' instead
34
* @author 唯然<[email protected]>
45
*/
56

67
'use strict';
78

8-
const mod = require('../lib/index.js');
9+
const plugin = require('../lib/index.js');
910

10-
module.exports = {
11-
plugins: { 'eslint-plugin': mod },
12-
rules: mod.configs['tests-recommended'].rules,
13-
};
11+
module.exports = plugin.configs['flat/tests-recommended']

configs/tests.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/**
22
* @fileoverview the `tests` config for `eslint.config.js`
3+
* @deprecated use 'flat/tests' instead
34
* @author 唯然<[email protected]>
45
*/
56

67
'use strict';
78

8-
const mod = require('../lib/index.js');
9+
const plugin = require('../lib/index.js');
910

10-
module.exports = {
11-
plugins: { 'eslint-plugin': mod },
12-
rules: mod.configs.tests.rules,
13-
};
11+
module.exports = plugin.configs['flat/tests']

lib/index.js

+30-8
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,38 @@ const allRules = Object.fromEntries(
4242
])
4343
);
4444

45-
module.exports.meta = {
46-
name: packageMetadata.name,
47-
version: packageMetadata.version,
48-
};
45+
const plugin = {
46+
meta: {
47+
name: packageMetadata.name,
48+
version: packageMetadata.version,
49+
},
50+
rules: allRules,
51+
configs: {}, // assigned later
52+
}
4953

50-
module.exports.rules = allRules;
54+
// eslintrc configs
55+
Object.assign(plugin.configs, Object.keys(configFilters).reduce(
56+
(configs, configName) => {
57+
return Object.assign(configs, {
58+
[`flat/${configName}`]: {
59+
plugins: ['eslint-plugin'],
60+
rules: Object.fromEntries(
61+
Object.keys(allRules)
62+
.filter((ruleName) => configFilters[configName](allRules[ruleName]))
63+
.map((ruleName) => [`${PLUGIN_NAME}/${ruleName}`, 'error'])
64+
),
65+
},
66+
});
67+
},
68+
{}
69+
));
5170

52-
module.exports.configs = Object.keys(configFilters).reduce(
71+
// flat configs
72+
Object.assign(plugin.configs, Object.keys(configFilters).reduce(
5373
(configs, configName) => {
5474
return Object.assign(configs, {
5575
[configName]: {
56-
plugins: ['eslint-plugin'],
76+
plugins: { 'eslint-plugin': plugin},
5777
rules: Object.fromEntries(
5878
Object.keys(allRules)
5979
.filter((ruleName) => configFilters[configName](allRules[ruleName]))
@@ -63,4 +83,6 @@ module.exports.configs = Object.keys(configFilters).reduce(
6383
});
6484
},
6585
{}
66-
);
86+
));
87+
88+
module.exports = plugin;

0 commit comments

Comments
 (0)