Skip to content

Commit

Permalink
[New] Add ESLint 5 support
Browse files Browse the repository at this point in the history
  • Loading branch information
ai authored and ljharb committed Jun 23, 2018
1 parent 59fc04e commit add69cf
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ node_js:
os: linux

env:
- ESLINT_VERSION=5
- ESLINT_VERSION=4
- ESLINT_VERSION=3
- ESLINT_VERSION=2
Expand All @@ -31,6 +32,9 @@ matrix:
node_js: 6
- env: PACKAGE=resolvers/webpack
node_js: 4
- os: osx
env: ESLINT_VERSION=5
node_js: 10
- os: osx
env: ESLINT_VERSION=4
node_js: 8
Expand All @@ -40,6 +44,9 @@ matrix:
- os: osx
env: ESLINT_VERSION=2
node_js: 4
exclude:
- node_js: '4'
env: ESLINT_VERSION=5

before_install:
- 'nvm install-latest-npm'
Expand Down
6 changes: 6 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# Test against this version of Node.js
environment:
matrix:
- nodejs_version: "10"
- nodejs_version: "8"
- nodejs_version: "6"
- nodejs_version: "4"

matrix:
fast_finish: true
allow_failures:
- nodejs_version: "4" # for eslint 5

# platform:
# - x86
# - x64
Expand Down
3 changes: 1 addition & 2 deletions config/recommended.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ module.exports = {
// all of them)
parserOptions: {
sourceType: 'module',
ecmaVersion: 6,
ecmaFeatures: { experimentalObjectRestSpread: true },
ecmaVersion: 2018,
},
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"chai": "^3.5.0",
"coveralls": "^3.0.0",
"cross-env": "^4.0.0",
"eslint": "2.x - 4.x",
"eslint": "2.x - 5.x",
"eslint-import-resolver-node": "file:./resolvers/node",
"eslint-import-resolver-typescript": "^1.0.2",
"eslint-import-resolver-webpack": "file:./resolvers/webpack",
Expand All @@ -70,7 +70,7 @@
"typescript-eslint-parser": "^15.0.0"
},
"peerDependencies": {
"eslint": "2.x - 4.x"
"eslint": "2.x - 5.x"
},
"dependencies": {
"contains-path": "^0.1.0",
Expand Down
4 changes: 1 addition & 3 deletions tests/src/rules/namespace.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,7 @@ const valid = [
test({
code: `import * as names from './named-exports'; const {a, b, ...rest} = names;`,
parserOptions: {
ecmaFeatures: {
experimentalObjectRestSpread: true,
},
ecmaVersion: 2018,
},
}),
test({
Expand Down

0 comments on commit add69cf

Please sign in to comment.