|
|
@@ -17,7 +17,16 @@ module.exports = {
|
|
|
Rtc: true
|
|
|
},
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
extends: ["plugin:vue/recommended", "eslint:recommended"],
|
|
|
+=======
|
|
|
+ extends: [
|
|
|
+ "plugin:vue/essential",
|
|
|
+ "plugin:vue/strongly-recommended",
|
|
|
+ "plugin:vue/recommended",
|
|
|
+ "eslint:recommended"
|
|
|
+ ],
|
|
|
+>>>>>>> 729f3c17e2fff03767d7e2a5716a808e13d183f3
|
|
|
|
|
|
rules: {
|
|
|
"no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
|
|
|
@@ -32,8 +41,11 @@ module.exports = {
|
|
|
}
|
|
|
}
|
|
|
],
|
|
|
+<<<<<<< HEAD
|
|
|
"vue/no-unused-components": 0,
|
|
|
"vue/return-in-computed-property": 0,
|
|
|
+=======
|
|
|
+>>>>>>> 729f3c17e2fff03767d7e2a5716a808e13d183f3
|
|
|
"vue/singleline-html-element-content-newline": "off",
|
|
|
"vue/multiline-html-element-content-newline": "off",
|
|
|
"vue/name-property-casing": ["error", "PascalCase"],
|
|
|
@@ -60,7 +72,11 @@ module.exports = {
|
|
|
properties: "always"
|
|
|
}
|
|
|
],
|
|
|
+<<<<<<< HEAD
|
|
|
"comma-dangle": [0, "never"],
|
|
|
+=======
|
|
|
+ "comma-dangle": [2, "never"],
|
|
|
+>>>>>>> 729f3c17e2fff03767d7e2a5716a808e13d183f3
|
|
|
"comma-spacing": [
|
|
|
2,
|
|
|
{
|
|
|
@@ -163,7 +179,11 @@ module.exports = {
|
|
|
],
|
|
|
"padded-blocks": [2, "never"],
|
|
|
quotes: [
|
|
|
+<<<<<<< HEAD
|
|
|
0,
|
|
|
+=======
|
|
|
+ 2,
|
|
|
+>>>>>>> 729f3c17e2fff03767d7e2a5716a808e13d183f3
|
|
|
"single",
|
|
|
{
|
|
|
avoidEscape: true,
|
|
|
@@ -261,7 +281,11 @@ module.exports = {
|
|
|
location: "start"
|
|
|
}
|
|
|
],
|
|
|
+<<<<<<< HEAD
|
|
|
"array-bracket-spacing": [0, "never"],
|
|
|
+=======
|
|
|
+ "array-bracket-spacing": [2, "never"],
|
|
|
+>>>>>>> 729f3c17e2fff03767d7e2a5716a808e13d183f3
|
|
|
"arrow-parens": [1, "as-needed"],
|
|
|
"computed-property-spacing": [1, "never"],
|
|
|
"consistent-return": 0,
|
