aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZero~Informatique2020-06-19 23:38:38 +0200
committerOzoneGrif2020-06-28 14:11:13 +0200
commit8045242d9ca6bf962e3de579a8e9634ce0dfa5ba (patch)
treee15a88f9ac966ae31e6a4b5199e85c61f7bda396
parent4393f8f25025ea600dae30be2d6ad9067496ba40 (diff)
downloadldgallery-8045242d9ca6bf962e3de579a8e9634ce0dfa5ba.tar.gz
viewer: autoformat using eslint-prettier instead of VSC's integrated formatters
-rw-r--r--viewer/.eslintrc.js9
-rw-r--r--viewer/package.json2
-rw-r--r--viewer/visualstudio.code-workspace19
3 files changed, 21 insertions, 9 deletions
diff --git a/viewer/.eslintrc.js b/viewer/.eslintrc.js
index a67de5e..9d3fbbc 100644
--- a/viewer/.eslintrc.js
+++ b/viewer/.eslintrc.js
@@ -5,14 +5,14 @@ module.exports = {
5 node: true, 5 node: true,
6 }, 6 },
7 7
8 extends: [ 8 plugins: ["prettier"],
9 "plugin:vue/essential", 9
10 "@vue/typescript" 10 extends: ["plugin:vue/essential", "plugin:prettier/recommended", "@vue/typescript"],
11 ],
12 11
13 rules: { 12 rules: {
14 "no-console": "off", 13 "no-console": "off",
15 "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off", 14 "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
15 "prettier/prettier": "warn",
16 "eol-last": ["warn", "always"], 16 "eol-last": ["warn", "always"],
17 "object-curly-spacing": ["warn", "always"], 17 "object-curly-spacing": ["warn", "always"],
18 "quote-props": ["warn", "as-needed"], 18 "quote-props": ["warn", "as-needed"],
@@ -36,5 +36,4 @@ module.exports = {
36 sourceType: "module", 36 sourceType: "module",
37 parser: "@typescript-eslint/parser", 37 parser: "@typescript-eslint/parser",
38 }, 38 },
39
40}; 39};
diff --git a/viewer/package.json b/viewer/package.json
index d1bb5a2..cd5191d 100644
--- a/viewer/package.json
+++ b/viewer/package.json
@@ -43,6 +43,8 @@
43 "@vue/cli-service": "^4.2.3", 43 "@vue/cli-service": "^4.2.3",
44 "@vue/eslint-config-typescript": "^5.0.2", 44 "@vue/eslint-config-typescript": "^5.0.2",
45 "eslint": "^6.8.0", 45 "eslint": "^6.8.0",
46 "eslint-config-prettier": "^6.11.0",
47 "eslint-plugin-prettier": "^3.1.4",
46 "eslint-plugin-vue": "^6.2.2", 48 "eslint-plugin-vue": "^6.2.2",
47 "node-sass": "^4.13.1", 49 "node-sass": "^4.13.1",
48 "sass-loader": "^8.0.2", 50 "sass-loader": "^8.0.2",
diff --git a/viewer/visualstudio.code-workspace b/viewer/visualstudio.code-workspace
index 8315cbb..fb23e99 100644
--- a/viewer/visualstudio.code-workspace
+++ b/viewer/visualstudio.code-workspace
@@ -6,22 +6,33 @@
6 ], 6 ],
7 "settings": { 7 "settings": {
8 "editor.tabSize": 2, 8 "editor.tabSize": 2,
9 "editor.formatOnSave": true,
10 "editor.wordBasedSuggestions": false, 9 "editor.wordBasedSuggestions": false,
11 "editor.detectIndentation": false, 10 "editor.detectIndentation": false,
12 "files.insertFinalNewline": true, 11 "files.insertFinalNewline": true,
13 "files.trimFinalNewlines": true, 12 "files.trimFinalNewlines": true,
14 "javascript.format.semicolons": "insert", 13 "javascript.format.semicolons": "insert",
15 "typescript.disableAutomaticTypeAcquisition": true, 14 "typescript.disableAutomaticTypeAcquisition": true,
16 "vue-i18n-ally.keystyle": "flat",
17 "vue-i18n-ally.localesPaths": "src/locales",
18 "i18n-ally.localesPaths": "src/locales", 15 "i18n-ally.localesPaths": "src/locales",
16 // ---
17 // Autoformating is done with eslint-prettier
18 "eslint.enable": true,
19 "eslint.onIgnoredFiles": "warn",
20 "vetur.format.enable": false,
21 "javascript.format.enable": false,
22 "typescript.format.enable": false,
23 "html.format.enable": false,
24 "eslint.format.enable": false,
25 "editor.formatOnSave": false,
26 "editor.codeActionsOnSave": {
27 "source.fixAll.eslint": true,
28 },
29 // ---
19 }, 30 },
20} 31}
21// Recommended Visual Studio Code extensions: 32// Recommended Visual Studio Code extensions:
22// - Vetur 33// - Vetur
23// - ESLint 34// - ESLint
24// - Vue i18n Ally 35// - i18n Ally
25// - SCSS Everywhere 36// - SCSS Everywhere
26// - SCSS Formatter 37// - SCSS Formatter
27// - Debugger for Chrome 38// - Debugger for Chrome