Skip to content

Commit 7ccf7b3

Browse files
committed
feat: update to ESLint v5
closes #2322 closes #2704
1 parent 51656ee commit 7ccf7b3

File tree

5 files changed

+247
-126
lines changed

5 files changed

+247
-126
lines changed

package.json

+3
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,8 @@
7676
"vue": "2.5.17",
7777
"vue-template-compiler": "2.5.17",
7878
"vue-server-renderer": "2.5.17"
79+
},
80+
"dependencies": {
81+
"babel-eslint": "^10.0.1"
7982
}
8083
}

packages/@vue/cli-plugin-eslint/generator.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => {
1010
lint: 'vue-cli-service lint'
1111
},
1212
eslintConfig,
13-
devDependencies: {}
13+
// TODO:
14+
// Move these dependencies to package.json in v4.
15+
// Now in v3 we have to add redundant eslint related dependencies
16+
// in order to keep compatibility with v3.0.x users who defaults to ESlint v4.
17+
devDependencies: {
18+
'eslint': '^5.8.0',
19+
'eslint-plugin-vue': '^5.0.0-0'
20+
}
1421
}
1522

1623
if (config === 'airbnb') {

packages/@vue/cli-plugin-eslint/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const path = require('path')
33
module.exports = (api, options) => {
44
if (options.lintOnSave) {
55
const extensions = require('./eslintOptions').extensions(api)
6+
// Use loadModule to allow users to customize their ESLint dependency version.
67
const { loadModule } = require('@vue/cli-shared-utils')
78
const cwd = api.getCwd()
89
const eslintPkg = loadModule('eslint/package.json', cwd, true)

packages/@vue/cli-service-global/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"@vue/cli-plugin-eslint": "^3.0.5",
2727
"@vue/cli-service": "^3.0.5",
2828
"chalk": "^2.4.1",
29-
"eslint-plugin-vue": "^4.7.1",
29+
"eslint": "^5.8.0",
30+
"eslint-plugin-vue": "^5.0.0-0",
3031
"resolve": "^1.8.1",
3132
"vue": "^2.5.17",
3233
"vue-template-compiler": "^2.5.17"

0 commit comments

Comments
 (0)