diff --git a/.eslintrc.js b/.eslintrc.js index 3ffa47c379..03a5b1fefe 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -54,7 +54,7 @@ module.exports = { { "anonymous": "always", "asyncArrow": "always", - "named": "never", + "named": "never" } ], "array-bracket-spacing": "error", @@ -178,7 +178,10 @@ module.exports = { //https://eslint.org/docs/rules/no-whitespace-before-property "no-whitespace-before-property": "error", // https://eslint.org/docs/rules/object-curly-newline - "object-curly-newline": ["error", {"consistent": true, "multiline": true}], + "object-curly-newline": ["error", { + "consistent": true, + "multiline": true + }], // https://eslint.org/docs/rules/object-property-newline "object-property-newline": "error", // https://eslint.org/docs/rules/brace-style @@ -188,7 +191,7 @@ module.exports = { // https://eslint.org/docs/rules/operator-linebreak "operator-linebreak": ["error", "before", {"overrides": {"=": "after"}}], // https://eslint.org/docs/rules/padding-line-between-statements - "padding-line-between-statements":["error", { + "padding-line-between-statements": ["error", { "blankLine": "always", "prev": "multiline-block-like", "next": "*" @@ -200,11 +203,17 @@ module.exports = { // https://eslint.org/docs/rules/space-infix-ops "space-infix-ops": "error", // https://eslint.org/docs/rules/space-unary-ops - "space-unary-ops": ["error", {"words": true, "nonwords": false}], + "space-unary-ops": ["error", { + "words": true, + "nonwords": false + }], // https://eslint.org/docs/rules/arrow-spacing "arrow-spacing": "error", // https://eslint.org/docs/rules/semi-spacing - "semi-spacing": ["error", {"before": false, "after": true}], + "semi-spacing": ["error", { + "before": false, + "after": true + }], "vue/html-indent": [ "error", @@ -237,6 +246,7 @@ module.exports = { }], "vue/multiline-html-element-content-newline": "off", "vue/singleline-html-element-content-newline": "off", + "vue/no-mutating-props": "off" }, "overrides": [ diff --git a/package.json b/package.json index dd45f9f654..56f4354fc7 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "d3-time": "1.0.x", "d3-time-format": "2.1.x", "eslint": "7.0.0", - "eslint-plugin-vue": "^6.0.0", + "eslint-plugin-vue": "^7.5.0", "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0", "eventemitter3": "^1.2.0", "exports-loader": "^0.7.0", diff --git a/src/api/menu/menu.js b/src/api/menu/menu.js index 8a515109b7..0aa9eeacee 100644 --- a/src/api/menu/menu.js +++ b/src/api/menu/menu.js @@ -30,12 +30,12 @@ class Menu extends EventEmitter { this.options = options; this.component = new Vue({ - provide: { - actions: options.actions - }, components: { MenuComponent }, + provide: { + actions: options.actions + }, template: '' }); diff --git a/src/api/objects/RootRegistry.js b/src/api/objects/RootRegistry.js index c5e7dcacae..2485bc8a75 100644 --- a/src/api/objects/RootRegistry.js +++ b/src/api/objects/RootRegistry.js @@ -48,7 +48,7 @@ define([ this.providers.push(function () { return key; }); - } else if (_.isFunction(key)) { + } else if (typeof key === "function") { this.providers.push(key); } }; diff --git a/src/api/overlays/Dialog.js b/src/api/overlays/Dialog.js index d58ca8218a..502446ec2e 100644 --- a/src/api/overlays/Dialog.js +++ b/src/api/overlays/Dialog.js @@ -6,6 +6,9 @@ class Dialog extends Overlay { constructor({iconClass, message, title, hint, timestamp, ...options}) { let component = new Vue({ + components: { + DialogComponent: DialogComponent + }, provide: { iconClass, message, @@ -13,9 +16,6 @@ class Dialog extends Overlay { hint, timestamp }, - components: { - DialogComponent: DialogComponent - }, template: '' }).$mount(); diff --git a/src/api/overlays/ProgressDialog.js b/src/api/overlays/ProgressDialog.js index 673270d72f..937a15b1e2 100644 --- a/src/api/overlays/ProgressDialog.js +++ b/src/api/overlays/ProgressDialog.js @@ -7,6 +7,9 @@ let component; class ProgressDialog extends Overlay { constructor({progressPerc, progressText, iconClass, message, title, hint, timestamp, ...options}) { component = new Vue({ + components: { + ProgressDialogComponent: ProgressDialogComponent + }, provide: { iconClass, message, @@ -14,9 +17,6 @@ class ProgressDialog extends Overlay { hint, timestamp }, - components: { - ProgressDialogComponent: ProgressDialogComponent - }, data() { return { model: { diff --git a/src/api/overlays/components/OverlayComponent.vue b/src/api/overlays/components/OverlayComponent.vue index e2381464ed..f06e1afcfd 100644 --- a/src/api/overlays/components/OverlayComponent.vue +++ b/src/api/overlays/components/OverlayComponent.vue @@ -38,12 +38,12 @@