From c06fb73b413b5cfe05a00f5ec48f9d4378bae186 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 20 May 2020 07:23:10 +0200 Subject: [PATCH] Improve eslint / prettier configuration --- .eslintrc.js | 2 + .prettierrc.json | 2 +- package-lock.json | 95 +++++++++++++++++++++++++++++++++------- package.json | 1 + src/shared/apiService.js | 1 - 5 files changed, 84 insertions(+), 17 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index e29e8229..2b0e73eb 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,6 +7,8 @@ module.exports = { 'plugin:vue/essential', // 'plugin:vue/recommended', '@vue/airbnb', + 'plugin:prettier-vue/recommended', + 'prettier/vue', ], parserOptions: { parser: 'babel-eslint', diff --git a/.prettierrc.json b/.prettierrc.json index 7dea198a..75ddc398 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,6 +1,6 @@ { "printWidth": 100, "singleQuote": true, - "trailingComma": "es5", + "trailingComma": "all", "files": "./src/**/*.{js,vue,json}" } diff --git a/package-lock.json b/package-lock.json index 7afa1e51..d077932a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2493,14 +2493,14 @@ "dev": true }, "bootstrap": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz", - "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==" + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz", + "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==" }, "bootstrap-vue": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.13.0.tgz", - "integrity": "sha512-V/q2tgIY+tDxeBGOwqdPC4jk8CWmpwpSVY/1OVGxg4Jg1Jxcs6gQn7chhpI9KuBrO8diG/Nd6JRtnYwyE3b7Qw==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.14.0.tgz", + "integrity": "sha512-sqbS7iHYCZEj/dDx4Yaze99HcX6bZjO4bSWZ0xSgJwtWQlbfB2VDJ9Qjzjp9XI8TT32wYNGAMpnXpYjQvv5qyQ==", "requires": { "@nuxt/opencollective": "^0.3.0", "bootstrap": ">=4.4.1 <5.0.0", @@ -3315,9 +3315,9 @@ "dev": true }, "consola": { - "version": "2.11.3", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.11.3.tgz", - "integrity": "sha512-aoW0YIIAmeftGR8GSpw6CGQluNdkWMWh3yEFjH/hmynTYnMtibXszii3lxCXmk8YxJtI3FAK5aTiquA5VH68Gw==" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/consola/-/consola-2.12.1.tgz", + "integrity": "sha512-aEkkju9ZcEa9y2MhzNhfmTUws/CEZZ0LKu0FxftSU3HygPfVMMIMSYyYct+xBN6XNRhsaDZjw2HAv3m2ammXSA==" }, "console-browserify": { "version": "1.2.0", @@ -4784,6 +4784,71 @@ "prettier-linter-helpers": "^1.0.0" } }, + "eslint-plugin-prettier-vue": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier-vue/-/eslint-plugin-prettier-vue-2.1.0.tgz", + "integrity": "sha512-osE8owzqCWFGPiHf3KbPJu01VElWUWmJspm4NhBQ7DxM23Wv2XJwL4fsQv3W4ehMFh49KJuYbYSdvZMgOteasA==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.2", + "chalk": "^4.0.0", + "prettier": "^1.18.2 || ^2.0.0", + "prettier-linter-helpers": "^1.0.0", + "vue-template-compiler": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", + "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "eslint-plugin-vue": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz", @@ -11641,9 +11706,9 @@ } }, "vue-router": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz", - "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.2.0.tgz", + "integrity": "sha512-khkrcUIzMcI1rDcNtqkvLwfRFzB97GmJEsPAQdj7t/VvpGhmXLOkUfhc+Ah8CvpSXGXwuWuQO+x8Sy/xDhXZIA==" }, "vue-style-loader": { "version": "4.1.2", @@ -11680,9 +11745,9 @@ "dev": true }, "vuex": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.3.0.tgz", - "integrity": "sha512-1MfcBt+YFd20DPwKe0ThhYm1UEXZya4gVKUvCy7AtS11YAOUR+9a6u4fsv1Rr6ePZCDNxW/M1zuIaswp6nNv8Q==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.4.0.tgz", + "integrity": "sha512-ajtqwEW/QhnrBZQsZxCLHThZZaa+Db45c92Asf46ZDXu6uHXgbfVuBaJ4gzD2r4UX0oMJHstFwd2r2HM4l8umg==" }, "watchpack": { "version": "1.6.1", diff --git a/package.json b/package.json index 0eb9a9fa..e7a6bda6 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "eslint-config-airbnb": "^18.1.0", "eslint-config-prettier": "^6.11.0", "eslint-plugin-prettier": "^3.1.3", + "eslint-plugin-prettier-vue": "^2.1.0", "eslint-plugin-vue": "^6.2.2", "mutationobserver-shim": "^0.3.3", "popper.js": "^1.16.0", diff --git a/src/shared/apiService.js b/src/shared/apiService.js index 475e8a20..526751ae 100644 --- a/src/shared/apiService.js +++ b/src/shared/apiService.js @@ -39,7 +39,6 @@ api.interceptors.response.use( }, ); - export function setBaseUrl(baseURL) { if (baseURL === null) { // Reset to "local" baseurl