Skip to content

Commit b96c3bd

Browse files
authored
feat: update eslint-related packages (#6123)
1 parent 5c728a4 commit b96c3bd

File tree

9 files changed

+510
-184
lines changed

9 files changed

+510
-184
lines changed

docs/migrations/migrate-from-v4.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ Though it works in all our tests, please be aware that this approach is still so
8686

8787
### ESLint Plugin
8888

89-
* `eslint-loader` is upgraded [from v2 to v4](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md). The only major change is that it dropped support for ESLint < v6.
89+
* `eslint-loader` is replaced by [eslint-webpack-plugin](https://github.com/webpack-contrib/eslint-webpack-plugin), dropping support for ESLint <= 6.
90+
* New projects are now generated with `eslint-plugin-vue` v7, see its [release notes](https://github.com/vuejs/eslint-plugin-vue/releases/tag/v7.0.0) for breaking changes.
9091

9192
### PWA Plugin
9293

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,25 @@
3838
"devDependencies": {
3939
"@babel/core": "^7.12.9",
4040
"@babel/eslint-parser": "^7.12.1",
41-
"@typescript-eslint/eslint-plugin": "^2.33.0",
42-
"@typescript-eslint/parser": "^2.33.0",
41+
"@typescript-eslint/eslint-plugin": "^4.9.1",
42+
"@typescript-eslint/parser": "^4.9.1",
4343
"@vue/eslint-config-airbnb": "^5.0.2",
4444
"@vue/eslint-config-prettier": "^6.0.0",
45-
"@vue/eslint-config-standard": "^5.1.2",
46-
"@vue/eslint-config-typescript": "^5.0.2",
45+
"@vue/eslint-config-standard": "^6.0.0",
46+
"@vue/eslint-config-typescript": "^7.0.0",
4747
"@vuepress/plugin-pwa": "^1.5.4",
4848
"@vuepress/theme-vue": "^1.5.4",
4949
"babel-core": "7.0.0-bridge.0",
5050
"babel-jest": "^26.6.3",
5151
"chromedriver": "^87.0.2",
5252
"debug": "^4.1.0",
5353
"eslint": "^7.15.0",
54-
"eslint-plugin-graphql": "^3.1.0",
54+
"eslint-plugin-graphql": "^4.0.0",
5555
"eslint-plugin-import": "^2.20.2",
5656
"eslint-plugin-node": "^11.1.0",
5757
"eslint-plugin-prettier": "^3.2.0",
5858
"eslint-plugin-promise": "^4.2.1",
59-
"eslint-plugin-standard": "^4.0.0",
60-
"eslint-plugin-vue": "^6.2.2",
59+
"eslint-plugin-vue": "^7.2.0",
6160
"eslint-plugin-vue-libs": "^4.0.0",
6261
"execa": "^1.0.0",
6362
"geckodriver": "^1.20.0",

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const DEPS_MAP = {
22
base: {
33
eslint: '^7.15.0',
4-
'eslint-plugin-vue': '^6.2.2'
4+
'eslint-plugin-vue': '^7.2.0'
55
},
66
airbnb: {
77
'@vue/eslint-config-airbnb': '^5.0.2',
@@ -13,16 +13,15 @@ const DEPS_MAP = {
1313
prettier: '^2.2.1'
1414
},
1515
standard: {
16-
'@vue/eslint-config-standard': '^5.1.2',
16+
'@vue/eslint-config-standard': '^6.0.0',
1717
'eslint-plugin-import': '^2.20.2',
1818
'eslint-plugin-node': '^11.1.0',
19-
'eslint-plugin-promise': '^4.2.1',
20-
'eslint-plugin-standard': '^4.0.0'
19+
'eslint-plugin-promise': '^4.2.1'
2120
},
2221
typescript: {
2322
'@vue/eslint-config-typescript': '^7.0.0',
24-
'@typescript-eslint/eslint-plugin': '^4.4.0',
25-
'@typescript-eslint/parser': '^4.4.0'
23+
'@typescript-eslint/eslint-plugin': '^4.9.1',
24+
'@typescript-eslint/parser': '^4.9.1'
2625
}
2726
}
2827

packages/@vue/cli-ui-addon-webpack/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@
2323
"@vue/cli-plugin-babel": "^4.5.8",
2424
"@vue/cli-plugin-eslint": "^4.5.8",
2525
"@vue/cli-service": "^4.5.8",
26-
"@vue/eslint-config-standard": "^5.1.2",
26+
"@vue/eslint-config-standard": "^6.0.0",
2727
"core-js": "^3.8.1",
2828
"eslint": "^7.15.0",
2929
"eslint-plugin-import": "^2.20.2",
3030
"eslint-plugin-node": "^11.1.0",
3131
"eslint-plugin-promise": "^4.2.1",
32-
"eslint-plugin-standard": "^4.0.0",
33-
"eslint-plugin-vue": "^6.2.2",
32+
"eslint-plugin-vue": "^7.2.0",
3433
"stylus": "^0.54.7",
3534
"stylus-loader": "^3.0.2",
3635
"vue-progress-path": "^0.0.2",

packages/@vue/cli-ui-addon-webpack/src/components/DonutModule.vue

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,14 @@ export default {
9090
]),
9191
9292
finalDasharray () {
93-
return (this.finalDashoffset === 0 ||
94-
this.finalDashoffset === this.dasharray * 2)
95-
? 0 : this.dasharray
93+
if (
94+
this.finalDashoffset === 0 ||
95+
this.finalDashoffset === this.dasharray * 2
96+
) {
97+
return 0
98+
}
99+
100+
return this.dasharray
96101
},
97102
98103
finalDashoffset () {

packages/@vue/cli-ui-addon-widgets/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@
2323
"@vue/cli-plugin-babel": "^4.5.8",
2424
"@vue/cli-plugin-eslint": "^4.5.8",
2525
"@vue/cli-service": "^4.5.8",
26-
"@vue/eslint-config-standard": "^5.1.2",
26+
"@vue/eslint-config-standard": "^6.0.0",
2727
"core-js": "^3.8.1",
2828
"eslint": "^7.15.0",
2929
"eslint-plugin-import": "^2.20.2",
3030
"eslint-plugin-node": "^11.1.0",
3131
"eslint-plugin-promise": "^4.2.1",
32-
"eslint-plugin-standard": "^4.0.0",
33-
"eslint-plugin-vue": "^6.2.2",
32+
"eslint-plugin-vue": "^7.2.0",
3433
"stylus": "^0.54.7",
3534
"stylus-loader": "^3.0.2",
3635
"vue-template-compiler": "^2.6.12"

packages/@vue/cli-ui/apollo-server/api/PluginApi.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ class PluginApi {
335335
return
336336
}
337337
}
338-
// eslint-disable-next-line standard/no-callback-literal
338+
// eslint-disable-next-line node/no-callback-literal
339339
cb({ data, emit })
340340
}
341341
this.ipcHandlers.push(handler)

packages/@vue/cli-ui/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,19 @@
7171
"@vue/cli-plugin-e2e-cypress": "^4.5.8",
7272
"@vue/cli-plugin-eslint": "^4.5.8",
7373
"@vue/cli-service": "^4.5.8",
74-
"@vue/eslint-config-standard": "^5.1.2",
74+
"@vue/eslint-config-standard": "^6.0.0",
7575
"@vue/ui": "^0.11.6",
7676
"ansi_up": "^4.0.4",
7777
"apollo-client": "^2.6.10",
7878
"apollo-link": "^1.2.14",
7979
"core-js": "^3.8.1",
8080
"cross-env": "^7.0.3",
8181
"eslint": "^7.15.0",
82-
"eslint-plugin-graphql": "^3.1.0",
82+
"eslint-plugin-graphql": "^4.0.0",
8383
"eslint-plugin-import": "^2.20.2",
8484
"eslint-plugin-node": "^11.1.0",
8585
"eslint-plugin-promise": "^4.2.1",
86-
"eslint-plugin-standard": "^4.0.0",
87-
"eslint-plugin-vue": "^6.2.2",
86+
"eslint-plugin-vue": "^7.2.0",
8887
"lint-staged": "^9.5.0",
8988
"lodash.debounce": "^4.0.8",
9089
"portal-vue": "^1.3.0",

0 commit comments

Comments
 (0)