diff options
| author | Valentin Popov <info@valentineus.link> | 2020-04-01 13:56:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 13:56:31 +0300 |
| commit | c9e51ad9e8f23fc6383129c34d762a0fd3450417 (patch) | |
| tree | bf6aa599d2790272b8bd645744eadcd290ff654e /src | |
| parent | 4aa0bc667bea03259f8bb26dba63795e74a86299 (diff) | |
| parent | adf39edc06ca27c1179751601ad56ea7b89c9ab4 (diff) | |
| download | eslint-config-c9e51ad9e8f23fc6383129c34d762a0fd3450417.tar.xz eslint-config-c9e51ad9e8f23fc6383129c34d762a0fd3450417.zip | |
Merge pull request #4 from valentineus/develop
Develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/rules/typescript/default.json | 10 | ||||
| -rw-r--r-- | src/rules/vue/default.json | 6 | ||||
| -rw-r--r-- | src/rules/vue/overrides.json | 5 | ||||
| -rw-r--r-- | src/vue-javascript.ts | 9 | ||||
| -rw-r--r-- | src/vue-typescript.ts | 9 |
5 files changed, 34 insertions, 5 deletions
diff --git a/src/rules/typescript/default.json b/src/rules/typescript/default.json index fe556bc..2b45050 100644 --- a/src/rules/typescript/default.json +++ b/src/rules/typescript/default.json @@ -222,7 +222,7 @@ "error", { "after": true, - "before": true, + "before": false, "overrides": { "arrow": { "after": true, @@ -234,19 +234,19 @@ }, "parameter": { "after": true, - "before": true + "before": false }, "property": { "after": true, - "before": true + "before": false }, "returnType": { "after": true, - "before": true + "before": false }, "variable": { "after": true, - "before": true + "before": false } } } diff --git a/src/rules/vue/default.json b/src/rules/vue/default.json index 376b47c..145c8f2 100644 --- a/src/rules/vue/default.json +++ b/src/rules/vue/default.json @@ -76,6 +76,12 @@ "singleline": 8 } ], + "vue/no-multi-spaces": [ + "error", + { + "ignoreProperties": false + } + ], "vue/no-unused-vars": [ "error" ], diff --git a/src/rules/vue/overrides.json b/src/rules/vue/overrides.json new file mode 100644 index 0000000..8927171 --- /dev/null +++ b/src/rules/vue/overrides.json @@ -0,0 +1,5 @@ +{ + "sort-keys": [ + "off" + ] +} diff --git a/src/vue-javascript.ts b/src/vue-javascript.ts index a3c7a46..39fba7d 100644 --- a/src/vue-javascript.ts +++ b/src/vue-javascript.ts @@ -1,4 +1,5 @@ import rDefault from "./rules/vue/default.json"; +import rOverrides from "./rules/vue/overrides.json"; module.exports = { "extends": [ @@ -8,6 +9,14 @@ module.exports = { "plugin:vue/recommended", "plugin:vue/strongly-recommended", ], + "overrides": [ + { + files: [ + "*.vue", + ], + rules: { ...rOverrides }, + }, + ], "parser": "vue-eslint-parser", "parserOptions": { extraFileExtensions: [ diff --git a/src/vue-typescript.ts b/src/vue-typescript.ts index f44c6f2..11d4d61 100644 --- a/src/vue-typescript.ts +++ b/src/vue-typescript.ts @@ -1,4 +1,5 @@ import rDefault from "./rules/vue/default.json"; +import rOverrides from "./rules/vue/overrides.json"; module.exports = { "extends": [ @@ -8,6 +9,14 @@ module.exports = { "plugin:vue/recommended", "plugin:vue/strongly-recommended", ], + "overrides": [ + { + files: [ + "*.vue", + ], + rules: { ...rOverrides }, + }, + ], "parser": "vue-eslint-parser", "parserOptions": { createDefaultProgram: true, |