Merge remote-tracking branch 'upstream/master' into mainteance/reesta…

…blish-tests Signed-off-by: Christian Wolf <github@christianwolf.email>
nextcloud · May 21, 2022 · 6662607 · 6662607
2 parents c739444 + 942c91d
commit 6662607
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
   [#1000](https://github.com/nextcloud/cookbook/pull/1000) @seyfeb
 - Reenable the fixup action after deprecation in central repository
   [#1012](https://github.com/nextcloud/cookbook/pull/1012) @christianlupus
+- Update eslint-plugin-vue
 
 ### Documentation
 - Add documentation on updates of the API endpoints

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
 		"eslint-config-airbnb-base": "^15.0.0",
 		"eslint-config-prettier": "^8.0.0",
 		"eslint-plugin-import": "^2.22.1",
-		"eslint-plugin-vue": "^8.0.3",
+		"eslint-plugin-vue": "^9.0.1",
 		"prettier": "^2.2.1",
 		"stylelint": "^14.5.3",
 		"stylelint-config-idiomatic-order": "^8.1.0",

diff --git a/src/components/AppInvalidGuest.vue b/src/components/AppInvalidGuest.vue
@@ -30,6 +30,7 @@ import AppContent from "@nextcloud/vue/dist/Components/AppContent"
 export default {
     name: "InvalidGuest",
     components: {
+        // eslint-disable-next-line vue/no-reserved-component-names
         Content,
         AppContent,
     },

diff --git a/src/components/AppMain.vue b/src/components/AppMain.vue
@@ -24,6 +24,7 @@ export default {
         AppContent,
         AppControls,
         AppNavi,
+        // eslint-disable-next-line vue/no-reserved-component-names
         Content,
     },
     watch: {