Merge branch 'main' into dependabot/npm_and_yarn/vue/cli-plugin-router-5.0.8

Author: sorydima

package-lock.json

@@ -47,7 +47,7 @@
     "@types/node": "^13.1.4",
     "@vue/cli-plugin-router": "^5.0.8",
     "@vue/cli-plugin-vuex": "^4.1.0",
-    "@vue/eslint-config-prettier": "^5.0.0",
+    "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^4.0.0",
     "eslint": "^5.16.0",
     "eslint-plugin-prettier": "^3.4.1",