From 900afbbb6ba6ead342c65e8a45c175d4f2b52ce1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2020 03:10:39 +0000 Subject: [PATCH 1/2] Bump eslint-plugin-node from 8.0.1 to 11.0.0 Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 8.0.1 to 11.0.0. - [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases) - [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v8.0.1...v11.0.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 74 +++++++++++++++++++++++++++++++++++------------ package.json | 2 +- 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index a1f800214..e4981f728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7146,19 +7146,34 @@ } }, "eslint-plugin-es": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz", - "integrity": "sha512-XfFmgFdIUDgvaRAlaXUkxrRg5JSADoRC8IkKLc/cISeR3yHVMefFHQZpcyXXEUUPHfy5DwviBcrfqlyqEwlQVw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz", + "integrity": "sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==", "dev": true, "requires": { - "eslint-utils": "^1.3.0", - "regexpp": "^2.0.1" + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" }, "dependencies": { + "eslint-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz", + "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "dev": true + }, "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz", + "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==", "dev": true } } @@ -7262,23 +7277,44 @@ } }, "eslint-plugin-node": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz", - "integrity": "sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz", + "integrity": "sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg==", "dev": true, "requires": { - "eslint-plugin-es": "^1.3.1", - "eslint-utils": "^1.3.1", - "ignore": "^5.0.2", + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", + "ignore": "^5.1.1", "minimatch": "^3.0.4", - "resolve": "^1.8.1", - "semver": "^5.5.0" + "resolve": "^1.10.1", + "semver": "^6.1.0" }, "dependencies": { + "eslint-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz", + "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "dev": true + }, "ignore": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz", - "integrity": "sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } diff --git a/package.json b/package.json index 8332ffc72..74dedc976 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "eslint-friendly-formatter": "^4.0.1", "eslint-loader": "^3.0.3", "eslint-plugin-import": "^2.19.1", - "eslint-plugin-node": "^8.0.1", + "eslint-plugin-node": "^11.0.0", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.1", "eslint-plugin-vue": "^6.1.2", From 6bbfe004745046b9db6d375c4b16c6d6d31d41d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sun, 5 Jan 2020 18:54:00 +0100 Subject: [PATCH 2/2] Update eslint config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .eslintrc.js | 63 +---------- package-lock.json | 21 ++++ package.json | 2 + src/App.vue | 16 +-- src/BoardSelector.vue | 18 ++-- src/CardSelector.vue | 30 +++--- src/components/ActivityEntry.vue | 14 +-- src/components/CollaborationView.vue | 17 ++- src/components/ColorPicker.vue | 21 ++-- src/components/Controls.vue | 50 +++++---- src/components/List.vue | 2 +- src/components/Sidebar.vue | 4 +- src/components/board/Board.vue | 34 +++--- src/components/board/BoardSidebar.vue | 21 ++-- src/components/board/DeletedTabSidebar.vue | 20 ++-- src/components/board/SharingTabSidebar.vue | 43 ++++---- src/components/board/Stack.vue | 46 ++++---- src/components/board/TagsTabSidebar.vue | 41 +++---- src/components/board/TimelineTabSidebar.vue | 29 ++--- src/components/boards/BoardItem.vue | 26 ++--- src/components/boards/Boards.vue | 16 +-- src/components/card/CardSidebar.vue | 102 ++++++++++-------- src/components/cards/AvatarList.vue | 30 +++--- src/components/cards/CardBadges.vue | 16 +-- src/components/cards/CardItem.vue | 56 +++++----- src/components/navigation/AppNavigation.vue | 57 +++++----- .../navigation/AppNavigationAddBoard.vue | 19 ++-- .../navigation/AppNavigationBoard.vue | 58 +++++----- .../navigation/AppNavigationBoardCategory.vue | 35 +++--- src/init-collections.js | 8 +- src/main.js | 6 +- src/mixins/color.js | 20 ++-- src/router.js | 48 ++++----- src/services/BoardApi.js | 6 +- src/store/card.js | 34 +++--- src/store/main.js | 26 ++--- src/store/stack.js | 28 ++--- 37 files changed, 540 insertions(+), 543 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 06874304a..f867aa193 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,67 +1,8 @@ module.exports = { - root: true, - env: { - browser: true, - es6: true, - node: true, - jest: true - }, - globals: { - t: true, - n: true, - OC: true, - OCA: true, - Vue: true, - VueRouter: true - }, - parserOptions: { - parser: 'babel-eslint', - ecmaVersion: 6 - }, extends: [ - 'eslint:recommended', - 'plugin:node/recommended', - 'plugin:vue/essential', - 'plugin:vue/recommended', - 'standard' + 'nextcloud' ], - plugins: ['vue', 'node'], rules: { - // space before function () - 'space-before-function-paren': ['error', 'never'], - // curly braces always space - 'object-curly-spacing': ['error', 'always'], - // stay consistent with array brackets - 'array-bracket-newline': ['error', 'consistent'], - // 1tbs brace style - 'brace-style': 'error', - // tabs only - indent: ['error', 'tab'], - 'no-tabs': 0, - 'vue/html-indent': ['error', 'tab'], - // only debug console - 'no-console': ['warn', { allow: ['error', 'warn', 'debug'] }], - // classes blocks - 'padded-blocks': ['error', { classes: 'always' }], - // always have the operator in front - 'operator-linebreak': ['error', 'before'], - // ternary on multiline - 'multiline-ternary': ['error', 'always-multiline'], - // es6 import/export and require - 'node/no-unpublished-require': ['off'], - 'node/no-unsupported-features/es-syntax': ['off'], - // space before self-closing elements - 'vue/html-closing-bracket-spacing': 'error', - // code spacing with attributes - 'vue/max-attributes-per-line': [ - 'error', - { - singleline: 3, - multiline: { - max: 3, - allowFirstLine: true - } - } - ] + 'valid-jsdoc': ['warn'], } } diff --git a/package-lock.json b/package-lock.json index e4981f728..ac2afc099 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6976,6 +6976,12 @@ } } }, + "eslint-config-nextcloud": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/eslint-config-nextcloud/-/eslint-config-nextcloud-0.1.1.tgz", + "integrity": "sha512-/1VAkt7Y/m63eZfBiYkSzZMwQtmz0DFXuJnLebrzIY1GtpIj/Y3c//j4ZDiH5o0vbdn9laIc2Mb/01DIjzvt3g==", + "dev": true + }, "eslint-config-standard": { "version": "12.0.0", "resolved": "http://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz", @@ -7276,6 +7282,15 @@ } } }, + "eslint-plugin-nextcloud": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-nextcloud/-/eslint-plugin-nextcloud-0.3.0.tgz", + "integrity": "sha512-LUD2qdirGL0BRt4uaMDGxen17mWVq9JwuGDt7P7Celz7bzdu0X48RrS8mhXn9e0w78+nYN5kPoULG2Bw04r4HA==", + "dev": true, + "requires": { + "requireindex": "~1.2.0" + } + }, "eslint-plugin-node": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz", @@ -15232,6 +15247,12 @@ "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=", "dev": true }, + "requireindex": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz", + "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==", + "dev": true + }, "resolve": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", diff --git a/package.json b/package.json index 74dedc976..542a049a8 100644 --- a/package.json +++ b/package.json @@ -62,10 +62,12 @@ "babel-loader": "^8.0.6", "css-loader": "^3.4.0", "eslint": "^6.8.0", + "eslint-config-nextcloud": "^0.1.1", "eslint-config-standard": "^12.0.0", "eslint-friendly-formatter": "^4.0.1", "eslint-loader": "^3.0.3", "eslint-plugin-import": "^2.19.1", + "eslint-plugin-nextcloud": "^0.3.0", "eslint-plugin-node": "^11.0.0", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.1", diff --git a/src/App.vue b/src/App.vue index 427877404..784f1a394 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,7 +41,7 @@ const boardApi = new BoardApi() export default { name: 'App', components: { - AppNavigation + AppNavigation, }, data: function() { return { @@ -54,19 +54,19 @@ export default { action: () => { }, reset: () => { - } + }, }, action: () => { this.addButton.classes.push('editing') - } - } + }, + }, } }, computed: { ...mapState({ navShown: state => state.navShown, sidebarShownState: state => state.sidebarShown, - currentBoard: state => state.currentBoard + currentBoard: state => state.currentBoard, }), // TODO: properly handle sidebar showing for route subview and board sidebar sidebarRouterView() { @@ -75,17 +75,17 @@ export default { }, sidebarShown() { return this.sidebarRouterView || this.sidebarShownState - } + }, }, provide: function() { return { - boardApi: boardApi + boardApi: boardApi, } }, created: function() { this.$store.dispatch('loadBoards') this.$store.dispatch('loadSharees') - } + }, } diff --git a/src/BoardSelector.vue b/src/BoardSelector.vue index 1422ee603..7e50bbe1c 100644 --- a/src/BoardSelector.vue +++ b/src/BoardSelector.vue @@ -25,10 +25,10 @@ @@ -71,19 +77,19 @@ export default { board: { type: Object, required: false, - default: null - } + default: null, + }, }, data() { return { newStackTitle: '', stack: '', - showArchived: false + showArchived: false, } }, computed: { ...mapState({ - compactMode: state => state.compactMode + compactMode: state => state.compactMode, }), archivStyle() { @@ -91,7 +97,7 @@ export default { return 'opacity: 1.0' } return 'opacity: 0.3' - } + }, }, methods: { toggleNav() { @@ -112,8 +118,8 @@ export default { this.$store.dispatch('createStack', this.stack) this.newStackTitle = '' this.stack = null - } - } + }, + }, } diff --git a/src/components/List.vue b/src/components/List.vue index fdfb710c5..dcfa29716 100644 --- a/src/components/List.vue +++ b/src/components/List.vue @@ -26,7 +26,7 @@ diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 3a5234a00..b41af9c2c 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -30,8 +30,8 @@ export default { methods: { closeSidebar() { this.$router.push({ name: 'board' }) - } - } + }, + }, } diff --git a/src/components/board/Board.vue b/src/components/board/Board.vue index bbf397b96..0cf5de2c2 100644 --- a/src/components/board/Board.vue +++ b/src/components/board/Board.vue @@ -24,11 +24,11 @@
- - - - - + + + + +
@@ -51,30 +51,30 @@ export default { Controls, Container, Draggable, - Stack + Stack, }, inject: [ - 'boardApi' + 'boardApi', ], props: { id: { type: Number, - default: null - } + default: null, + }, }, data: function() { return { - loading: true + loading: true, } }, computed: { ...mapState({ board: state => state.currentBoard, - showArchived: state => state.showArchived + showArchived: state => state.showArchived, }), stacksByBoard() { return this.$store.getters.stacksByBoard(this.board.id) - } + }, /* cardsByStack() { return (id) => this.$store.getters.cardsByStack(id) } */ @@ -83,7 +83,7 @@ export default { id: 'fetchData', showArchived() { this.fetchData() - } + }, }, created() { this.fetchData() @@ -118,17 +118,17 @@ export default { } }, */ createStack() { - let newStack = { + const newStack = { title: 'FooBar', boardId: this.id, - order: this.stacksByBoard().length + order: this.stacksByBoard().length, } this.$store.dispatch('createStack', newStack) - } + }, /* deleteStack(stack) { this.$store.dispatch('deleteStack', stack) } */ - } + }, } diff --git a/src/components/board/BoardSidebar.vue b/src/components/board/BoardSidebar.vue index eab5c1f57..760bb4dce 100644 --- a/src/components/board/BoardSidebar.vue +++ b/src/components/board/BoardSidebar.vue @@ -21,11 +21,10 @@ --> diff --git a/src/components/board/DeletedTabSidebar.vue b/src/components/board/DeletedTabSidebar.vue index bfcbe132b..e1639236c 100644 --- a/src/components/board/DeletedTabSidebar.vue +++ b/src/components/board/DeletedTabSidebar.vue @@ -8,8 +8,7 @@