Skip to content

Commit 94ee38d

Browse files
authored
Upgrade Eslint (#1647)
* chore(eslint): upgrade eslint from v4.x to v5.x * chore(eslint): upgrade eslint-plugin-vue-libs to 4.x * chore(eslint): upgrade eslint-plugin-markdown to 1.x * chore(eslint): upgrade eslint-plugin-flowtype to version 3.x * chore(eslint): upgrade eslint and related dependencies from 5.x to 6.x * chore(eslint): upgrade eslint from v6.x to 7.x w/ related plugins * chore(eslint): move eslint to devDependencies
1 parent 9ad2629 commit 94ee38d

File tree

4 files changed

+338
-287
lines changed

4 files changed

+338
-287
lines changed

.eslintrc

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
"flowtype"
1111
],
1212
"extends": [
13-
"plugin:vue-libs/recommended",
14-
"plugin:flowtype/recommended"
13+
"plugin:flowtype/recommended",
14+
"plugin:vue-libs/recommended"
1515
],
1616
"rules": {
1717
"template-curly-spacing" : "off",
18+
"for-direction": "off",
19+
"getter-return": "off",
1820
"no-debugger": 2,
1921
"no-proto": 0,
2022
"space-before-function-paren": 0,

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
"conditional-specs": "^1.0.1",
3131
"conventional-changelog": "^3.1.12",
3232
"cross-env": "^5.0.0",
33-
"eslint": "^4.18.1",
34-
"eslint-plugin-flowtype": "^2.46.1",
35-
"eslint-plugin-markdown": "^1.0.0-beta.6",
36-
"eslint-plugin-vue-libs": "^2.1.0",
3733
"flow-bin": "^0.66.0",
3834
"lerna": "^3.20.2",
3935
"markdown-it-include": "^1.0.0",
@@ -68,13 +64,17 @@
6864
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
6965
"@vue/babel-preset-jsx": "^1.1.2",
7066
"@vue/composition-api": "^0.6.4",
71-
"babel-eslint": "^9.0.0",
67+
"babel-eslint": "^10.1.0",
7268
"babel-jest": "^26.0.1",
7369
"babel-loader": "^8.1.0",
7470
"commitizen": "^4.0.3",
7571
"core-js": "2",
7672
"css-loader": "^4.2.0",
7773
"cz-conventional-changelog": "^3.0.2",
74+
"eslint": "^7.6.0",
75+
"eslint-plugin-flowtype": "^5.2.0",
76+
"eslint-plugin-markdown": "^1.0.2",
77+
"eslint-plugin-vue-libs": "^4.0.0",
7878
"expect": "^26.2.0",
7979
"husky": "^3.1.0",
8080
"identity-obj-proxy": "^3.0.0",

test/specs/mounting-options/localVue.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ describeWithShallowAndMount('options.localVue', mountingMethod => {
181181
() => {
182182
const ChildComponent = Vue.extend({
183183
render(h) {
184-
h('p', this.$route.params)
184+
return h('p', this.$route.params)
185185
}
186186
})
187187
const TestComponent = {

0 commit comments

Comments
 (0)