Skip to content

Commit dd88614

Browse files
committed
Merge branch 'patch-10' into eslint-7
# Conflicts: # .eslintrc.yml # package.json
2 parents d008fab + 74e86c1 commit dd88614

File tree

19 files changed

+44
-28
lines changed

19 files changed

+44
-28
lines changed

.eslintrc.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,18 @@ root: true
22
extends:
33
- plugin:@mysticatea/es2015
44
- plugin:@mysticatea/+eslint-plugin
5+
6+
overrides:
7+
- files: [ "lib/utils.js", "scripts/*.js" ]
8+
rules:
9+
"@mysticatea/node/no-sync": off
10+
11+
- files:
12+
[
13+
"lib/configs.js",
14+
"lib/foreign-rules/ts.js",
15+
"lib/processors.js",
16+
"lib/rules.js",
17+
]
18+
rules:
19+
"@mysticatea/node/global-require": off

lib/configs/+node.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,30 @@ module.exports = {
4646
require: "readonly",
4747
},
4848
rules: {
49+
"@mysticatea/node/callback-return": "error",
4950
"@mysticatea/node/exports-style": ["error", "module.exports"],
5051
"@mysticatea/node/file-extension-in-import": [
5152
"error",
5253
"always",
5354
{ ".js": "never", ".ts": "never", ".tsx": "never" },
5455
],
56+
"@mysticatea/node/global-require": "error",
57+
"@mysticatea/node/handle-callback-err": "error",
5558
"@mysticatea/node/no-callback-literal": "off",
5659
"@mysticatea/node/no-deprecated-api": "error",
5760
"@mysticatea/node/no-exports-assign": "error",
5861
"@mysticatea/node/no-extraneous-import": "error",
5962
"@mysticatea/node/no-extraneous-require": "error",
6063
"@mysticatea/node/no-missing-import": "error",
6164
"@mysticatea/node/no-missing-require": "error",
65+
"@mysticatea/node/no-mixed-requires": "error",
66+
"@mysticatea/node/no-new-require": "error",
67+
"@mysticatea/node/no-path-concat": "error",
68+
"@mysticatea/node/no-process-env": "error",
69+
"@mysticatea/node/no-process-exit": "error",
70+
"@mysticatea/node/no-restricted-import": "error",
71+
"@mysticatea/node/no-restricted-require": "error",
72+
"@mysticatea/node/no-sync": "error",
6273
"@mysticatea/node/no-unpublished-bin": "error",
6374
"@mysticatea/node/no-unpublished-import": "error",
6475
"@mysticatea/node/no-unpublished-require": "error",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@typescript-eslint/parser": "^4.33.0",
1818
"eslint-plugin-eslint-comments": "^3.2.0",
1919
"eslint-plugin-eslint-plugin": "^3.6.1",
20-
"eslint-plugin-node": "^10.0.0",
20+
"eslint-plugin-node": "^11.1.0",
2121
"eslint-plugin-prettier": "^3.4.1",
2222
"eslint-plugin-vue": "^6.2.2",
2323
"prettier": "^2.7.1",

tests/lib/configs/_rules.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const {
99
ConfigArrayFactory,
1010
} = require("eslint/lib/cli-engine/config-array-factory")
1111
const Validator = require("eslint/lib/shared/config-validator")
12+
const { rules: removedRules } = require("eslint/conf/replacements.json")
1213
const { rules: PluginRulesIndex } = require("@mysticatea/eslint-plugin")
1314

1415
const coreRules = new Linter().getRules()
@@ -25,9 +26,7 @@ const deprecatedRuleNames = new Set(
2526
.filter(([, rule]) => rule && rule.meta && rule.meta.deprecated)
2627
.map(([ruleId]) => ruleId)
2728
)
28-
const removedRuleNames = new Set(
29-
Object.keys(require("eslint/conf/replacements.json").rules)
30-
)
29+
const removedRuleNames = new Set(Object.keys(removedRules))
3130

3231
const configFactory = new ConfigArrayFactory()
3332

tests/lib/configs/browser.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
*/
66
"use strict"
77

8+
const config = require("../../../lib/configs/+browser")
89
const Rules = require("./_rules")
910

1011
describe("'+browser.js'", () => {
11-
const config = require("../../../lib/configs/+browser")
12-
1312
it("should be a valid config.", () => {
1413
Rules.validateConfig(config, "+browser.js")
1514
})

tests/lib/configs/es2015.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"use strict"
77

88
const assert = require("assert")
9+
const config = require("../../../lib/configs/es2015")
910
const Rules = require("./_rules")
1011

1112
/**
@@ -22,7 +23,6 @@ function isES6Rule(ruleId) {
2223
}
2324

2425
describe("'es2015.js'", () => {
25-
const config = require("../../../lib/configs/es2015")
2626
const configuredRules = Rules.getRulesOfConfig(config, "es2015")
2727
const existingRules = Rules.getCoreRuleNames()
2828

tests/lib/configs/es2016.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
*/
66
"use strict"
77

8+
const config = require("../../../lib/configs/es2016")
89
const Rules = require("./_rules")
910

1011
describe("'es2016.js'", () => {
11-
const config = require("../../../lib/configs/es2016")
12-
1312
it("should be a valid config.", () => {
1413
Rules.validateConfig(config, "es2016.js")
1514
})

tests/lib/configs/es2017.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
*/
66
"use strict"
77

8+
const config = require("../../../lib/configs/es2017")
89
const Rules = require("./_rules")
910

1011
describe("'es2017.js'", () => {
11-
const config = require("../../../lib/configs/es2017")
12-
1312
it("should be a valid config.", () => {
1413
Rules.validateConfig(config, "es2017.js")
1514
})

tests/lib/configs/es2018.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
*/
66
"use strict"
77

8+
const config = require("../../../lib/configs/es2018")
89
const Rules = require("./_rules")
910

1011
describe("'es2018.js'", () => {
11-
const config = require("../../../lib/configs/es2018")
12-
1312
it("should be a valid config.", () => {
1413
Rules.validateConfig(config, "es2018.js")
1514
})

tests/lib/configs/es2019.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
*/
55
"use strict"
66

7+
const config = require("../../../lib/configs/es2019")
78
const Rules = require("./_rules")
89

910
describe("'es2019.js'", () => {
10-
const config = require("../../../lib/configs/es2019")
11-
1211
it("should be a valid config.", () => {
1312
Rules.validateConfig(config, "es2019.js")
1413
})

0 commit comments

Comments
 (0)