From e2fd156773dbc2e919c912673de092d707e8ef69 Mon Sep 17 00:00:00 2001 From: Derick Montague Date: Fri, 20 Dec 2019 13:26:53 -0600 Subject: Fix linting in script blocks in vue files - Removed the .eslintrc and added the pretteri rules to the eslintrc file - Ran `npm run lint --fix` Signed-off-by: Derick Montague Change-Id: I4e36c1967ae9b4d839ef88f1d47ffa20ab4e4991 --- .eslintrc.js | 8 +++- .prettierrc.js | 10 ----- src/App.vue | 6 +-- src/components/AppHeader/AppHeader.vue | 28 +++++++------- src/components/AppNavigation/AppNavigation.vue | 12 +++--- src/components/Global/StatusIcon.vue | 10 ++--- src/layouts/AppLayout.vue | 12 +++--- .../LocalUserManagement/LocalUserManagement.vue | 44 +++++++++++----------- .../LocalUserManagement/ModalSettings.vue | 2 +- .../LocalUserManagement/ModalUser.vue | 12 +++--- .../LocalUserManagement/TableRoles.vue | 30 +++++++-------- src/views/Login/Login.vue | 16 ++++---- src/views/Overview/Overview.vue | 24 ++++++------ src/views/Overview/OverviewEvents.vue | 12 +++--- src/views/Overview/OverviewQuickLinks.vue | 10 ++--- 15 files changed, 116 insertions(+), 120 deletions(-) delete mode 100644 .prettierrc.js diff --git a/.eslintrc.js b/.eslintrc.js index 2e8a358a..4de4c1fd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,7 +6,13 @@ module.exports = { extends: ['plugin:vue/essential', '@vue/prettier'], rules: { 'no-console': 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'prettier/prettier': [ + 'error', + { + singleQuote: true + } + ] }, parserOptions: { parser: 'babel-eslint' diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index 948879ba..00000000 --- a/.prettierrc.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - overrides: [ - { - files: '*.js', - options: { - singleQuote: true - } - } - ] -}; diff --git a/src/App.vue b/src/App.vue index d5b49329..a5a768a5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,15 +5,15 @@ diff --git a/src/views/AccessControl/LocalUserManagement/ModalUser.vue b/src/views/AccessControl/LocalUserManagement/ModalUser.vue index 70cd6141..73aa164c 100644 --- a/src/views/AccessControl/LocalUserManagement/ModalUser.vue +++ b/src/views/AccessControl/LocalUserManagement/ModalUser.vue @@ -47,10 +47,10 @@