Merge branch 'develop' for release v2.0v2.0

1 files changed, 4 insertions, 5 deletions

diff --git a/viewer/.eslintrc.js b/viewer/.eslintrc.js
index a67de5e..9d3fbbc 100644
--- a/viewer/.eslintrc.js
+++ b/viewer/.eslintrc.js
@@ -5,14 +5,14 @@ module.exports = {
     node: true,
   },
 
-  extends: [
-    "plugin:vue/essential",
-    "@vue/typescript"
-  ],
+  plugins: ["prettier"],
+
+  extends: ["plugin:vue/essential", "plugin:prettier/recommended", "@vue/typescript"],
 
   rules: {
     "no-console": "off",
     "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
+    "prettier/prettier": "warn",
     "eol-last": ["warn", "always"],
     "object-curly-spacing": ["warn", "always"],
     "quote-props": ["warn", "as-needed"],
@@ -36,5 +36,4 @@ module.exports = {
     sourceType: "module",
     parser: "@typescript-eslint/parser",
   },
-
 };