Merge branch 'master' into code-standards-update

2020-06-02 13:05:32 -07:00
parent d6bb1b2a12 c256696790
commit 7073b0717f
96 changed files with 1932 additions and 423 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,7 +11,8 @@ module.exports = {
    },
    "extends": [
        "eslint:recommended",
-        "plugin:vue/recommended"
+        "plugin:vue/recommended",
+        "plugin:you-dont-need-lodash-underscore/compatible"
    ],
    "parser": "vue-eslint-parser",
    "parserOptions": {
@@ -23,6 +24,9 @@ module.exports = {
        }
    },
    "rules": {
+        "you-dont-need-lodash-underscore/omit": "off",
+        "you-dont-need-lodash-underscore/throttle": "off",
+        "you-dont-need-lodash-underscore/flatten": "off",
        "no-bitwise": "error",
        "curly": "error",
        "eqeqeq": "error",