Skip to content

Commit f6f677b

Browse files
committed
Merge branch 'patch-4' into eslint-7
# Conflicts: # package.json
2 parents d29a58d + c2aec45 commit f6f677b

File tree

10 files changed

+23
-23
lines changed

10 files changed

+23
-23
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
os: [ubuntu-latest]
3131
eslint: [6]
32-
node: [8, 10, 12, 14, 16]
32+
node: [10, 12, 14, 16]
3333
include:
3434
# On other platforms
3535
- os: windows-latest
@@ -41,7 +41,7 @@ jobs:
4141
node: 16
4242
# On the minimum supported ESLint/Node.js version
4343
- eslint: 5.16.0
44-
node: 8.10.0
44+
node: 10.0.0
4545

4646
runs-on: ${{ matrix.os }}
4747
steps:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Additional ESLint's rules for Node.js
1414
$ npm install --save-dev eslint eslint-plugin-node
1515
```
1616

17-
- Requires Node.js `>=8.10.0`
17+
- Requires Node.js `^10.0.0 || ^12.0.0 || >=14.0.0`
1818
- Requires ESLint `>=5.16.0`
1919

2020
**Note:** It recommends a use of [the "engines" field of package.json](https://docs.npmjs.com/files/package.json#engines). The "engines" field is used by `node/no-unsupported-features/*` rules.
@@ -53,7 +53,7 @@ $ npm install --save-dev eslint eslint-plugin-node
5353
"version": "1.0.0",
5454
"type": "commonjs",
5555
"engines": {
56-
"node": ">=8.10.0"
56+
"node": ">=10.0.0"
5757
}
5858
}
5959
```

docs/rules/no-deprecated-api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ For example of `package.json`:
149149
"name": "your-module",
150150
"version": "1.0.0",
151151
"engines": {
152-
"node": ">=8.0.0"
152+
"node": ">=10.0.0"
153153
}
154154
}
155155
```
156156

157-
If you omit the [engines] field, this rule chooses `>=8.0.0` as the configured Node.js version since `8` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
157+
If you omit the [engines] field, this rule chooses `>=10.0.0` as the configured Node.js version since `10` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
158158

159159
### Options
160160

@@ -164,7 +164,7 @@ This rule has 3 options.
164164
{
165165
"rules": {
166166
"node/no-deprecated-api": ["error", {
167-
"version": ">=8.0.0",
167+
"version": ">=10.0.0",
168168
"ignoreModuleItems": [],
169169
"ignoreGlobalItems": []
170170
}]

docs/rules/no-unsupported-features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ For example of `package.json`:
3131
"name": "your-module",
3232
"version": "1.0.0",
3333
"engines": {
34-
"node": ">=6.0.0"
34+
"node": ">=10.0.0"
3535
}
3636
}
3737
```
3838

39-
If the [engines] field is omitted, this rule chooses `4` since it's the minimum version the community is maintaining.
39+
If you omit the [engines] field, this rule chooses `>=10.0.0` as the configured Node.js version since `10` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
4040

4141
Examples of :-1: **incorrect** code for this rule:
4242

docs/rules/no-unsupported-features/es-builtins.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ For example of `package.json`:
2727
"name": "your-module",
2828
"version": "1.0.0",
2929
"engines": {
30-
"node": ">=8.0.0"
30+
"node": ">=10.0.0"
3131
}
3232
}
3333
```
3434

35-
If you omit the [engines] field, this rule chooses `>=8.0.0` as the configured Node.js version since `8` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
35+
If you omit the [engines] field, this rule chooses `>=10.0.0` as the configured Node.js version since `10` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
3636

3737
### Options
3838

3939
```json
4040
{
4141
"node/no-unsupported-features/es-builtins": ["error", {
42-
"version": ">=8.0.0",
42+
"version": ">=10.0.0",
4343
"ignores": []
4444
}]
4545
}

docs/rules/no-unsupported-features/es-syntax.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ For example of `package.json`:
3030
"name": "your-module",
3131
"version": "1.0.0",
3232
"engines": {
33-
"node": ">=8.0.0"
33+
"node": ">=10.0.0"
3434
}
3535
}
3636
```
3737

38-
If you omit the [engines] field, this rule chooses `>=8.0.0` as the configured Node.js version since `8` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
38+
If you omit the [engines] field, this rule chooses `>=10.0.0` as the configured Node.js version since `10` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
3939

4040
### Options
4141

4242
```json
4343
{
4444
"node/no-unsupported-features/es-syntax": ["error", {
45-
"version": ">=8.0.0",
45+
"version": ">=10.0.0",
4646
"ignores": []
4747
}]
4848
}

docs/rules/no-unsupported-features/node-builtins.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ For example of `package.json`:
2424
"name": "your-module",
2525
"version": "1.0.0",
2626
"engines": {
27-
"node": ">=8.0.0"
27+
"node": ">=10.0.0"
2828
}
2929
}
3030
```
3131

32-
If you omit the [engines] field, this rule chooses `>=8.0.0` as the configured Node.js version since `8` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
32+
If you omit the [engines] field, this rule chooses `>=10.0.0` as the configured Node.js version since `10` is the minimum version the community is maintaining (see also [Node.js Release Working Group](https://github.com/nodejs/Release#readme)).
3333

3434
### Options
3535

3636
```json
3737
{
3838
"node/no-unsupported-features/node-builtins": ["error", {
39-
"version": ">=8.0.0",
39+
"version": ">=10.0.0",
4040
"ignores": []
4141
}]
4242
}

lib/rules/no-unsupported-features.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const VERSION_SCHEMA = {
3131
},
3232
],
3333
}
34-
const DEFAULT_VERSION = "4.0.0"
34+
const DEFAULT_VERSION = "10.0.0"
3535
const FUNC_TYPE = /^(?:Arrow)?Function(?:Declaration|Expression)$/u
3636
const CLASS_TYPE = /^Class(?:Declaration|Expression)$/u
3737
const DESTRUCTURING_PARENT_TYPE = /^(?:Function(?:Declaration|Expression)|ArrowFunctionExpression|AssignmentExpression|VariableDeclarator)$/u

lib/util/get-configured-node-version.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function getEnginesNode(filename) {
2323
*
2424
* 1. Parse a given version then return it if it's valid.
2525
* 2. Look package.json up and parse `engines.node` then return it if it's valid.
26-
* 3. Return `>=8.0.0`.
26+
* 3. Return `>=10.0.0`.
2727
*
2828
* @param {string|undefined} version The version range text.
2929
* @param {string} filename The path to the current linting file.
@@ -34,6 +34,6 @@ module.exports = function getConfiguredNodeVersion(version, filename) {
3434
return (
3535
getSemverRange(version) ||
3636
getEnginesNode(filename) ||
37-
getSemverRange(">=8.0.0")
37+
getSemverRange(">=10.0.0")
3838
)
3939
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "11.1.0",
44
"description": "Additional ESLint's rules for Node.js",
55
"engines": {
6-
"node": ">=8.10.0"
6+
"node": "^10.0.0 || ^12.0.0 || >=14.0.0"
77
},
88
"main": "lib/index.js",
99
"files": [
@@ -14,7 +14,7 @@
1414
},
1515
"dependencies": {
1616
"eslint-plugin-es": "^4.1.0",
17-
"eslint-utils": "^2.1.0",
17+
"eslint-utils": "^3.0.0",
1818
"ignore": "^5.1.9",
1919
"is-core-module": "^2.8.0",
2020
"minimatch": "^3.0.4",

0 commit comments

Comments
 (0)