Skip to content

Commit 69e16a6

Browse files
committed
⚡ improvement: support ESLint v6
closes #12
1 parent 4dc9972 commit 69e16a6

File tree

8 files changed

+2139
-2206
lines changed

8 files changed

+2139
-2206
lines changed

lib/utils/collect-keys.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ function collectKeys (files, extensions) {
104104

105105
// setup linter
106106
const linter = new Linter()
107+
linter.defineParser('vue-eslint-parser', require(require.resolve(config.parser)))
107108
linter.defineRule(INTERNAL_RULE_KEY, { create })
108109

109110
// detect used lodalization keys with linter

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"devDependencies": {
2323
"conventional-changelog-cli": "^2.0.12",
2424
"conventional-github-releaser": "^3.1.2",
25-
"eslint": "^5.15.0",
25+
"eslint": "^5.15.0 || ^6.0.0",
2626
"eslint-plugin-markdown": "^1.0.0",
27-
"eslint-plugin-vue-libs": "^3.0.0",
27+
"eslint-plugin-vue-libs": "^3.0.0 || ^4.0.0",
2828
"git-commit-message-convention": "git://github.com/kazupon/git-commit-message-convention.git",
2929
"mocha": "^6.0.2",
3030
"nyc": "^13.3.0",
@@ -36,7 +36,7 @@
3636
"node": ">=0.10.0"
3737
},
3838
"peerDependencies": {
39-
"eslint": "^5.0.0"
39+
"eslint": "^5.0.0 || ^6.0.0"
4040
},
4141
"files": [
4242
"lib"

tests/lib/rules/no-dynamic-keys.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const RuleTester = require('eslint').RuleTester
77
const rule = require('../../../lib/rules/no-dynamic-keys')
88

99
const tester = new RuleTester({
10-
parser: 'vue-eslint-parser',
10+
parser: require.resolve('vue-eslint-parser'),
1111
parserOptions: { ecmaVersion: 2015 }
1212
})
1313

tests/lib/rules/no-html-messages.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('no-html-messages', () => {
3939
}
4040
}
4141
},
42-
parser: 'vue-eslint-parser',
42+
parser: require.resolve('vue-eslint-parser'),
4343
parserOptions: {
4444
ecmaVersion: 2015
4545
},
@@ -65,7 +65,7 @@ describe('no-html-messages', () => {
6565
}
6666
}
6767
},
68-
parser: 'vue-eslint-parser',
68+
parser: require.resolve('vue-eslint-parser'),
6969
parserOptions: {
7070
ecmaVersion: 2015
7171
},

tests/lib/rules/no-missing-keys.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const settings = {
1515
}
1616

1717
const tester = new RuleTester({
18-
parser: 'vue-eslint-parser',
18+
parser: require.resolve('vue-eslint-parser'),
1919
parserOptions: { ecmaVersion: 2015 }
2020
})
2121

tests/lib/rules/no-unused-keys.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('no-unused-keys', () => {
3333
it('settings.vue-i18n.localeDir', () => {
3434
const linter = new CLIEngine({
3535
baseConfig: {},
36-
parser: 'vue-eslint-parser',
36+
parser: require.resolve('vue-eslint-parser'),
3737
parserOptions: {
3838
ecmaVersion: 2015
3939
},
@@ -66,7 +66,7 @@ describe('no-unused-keys', () => {
6666
}
6767
}
6868
},
69-
parser: 'vue-eslint-parser',
69+
parser: require.resolve('vue-eslint-parser'),
7070
parserOptions: {
7171
ecmaVersion: 2015
7272
},
@@ -94,7 +94,7 @@ describe('no-unused-keys', () => {
9494
}
9595
}
9696
},
97-
parser: 'vue-eslint-parser',
97+
parser: require.resolve('vue-eslint-parser'),
9898
parserOptions: {
9999
ecmaVersion: 2015
100100
},

tests/lib/rules/no-v-html.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const RuleTester = require('eslint').RuleTester
77
const rule = require('../../../lib/rules/no-v-html')
88

99
const tester = new RuleTester({
10-
parser: 'vue-eslint-parser',
10+
parser: require.resolve('vue-eslint-parser'),
1111
parserOptions: { ecmaVersion: 2015 }
1212
})
1313

0 commit comments

Comments
 (0)