update dependencies

.gitignore

@@ -7,7 +7,7 @@ js/
 report
 clover.xml
 composer.lock
-.php_cs.cache
+.php-cs-fixer.cache
 appinfo/info.xsd
 
 # just sane ignores

composer.json

@@ -1,11 +1,11 @@
 {
 	"require-dev": {
 		"christophwurst/nextcloud": ">=20",
-		"nextcloud/coding-standard": "^0.5.0",
-		"friendsofphp/php-cs-fixer": "^2.18.6",
-		"squizlabs/php_codesniffer": "3.*",
-		"phan/phan": "^4.0",
-		"guzzlehttp/guzzle": "^7.0",
+		"nextcloud/coding-standard": "^1.0",
+		"friendsofphp/php-cs-fixer": "^3",
+		"squizlabs/php_codesniffer": "^3",
+		"phan/phan": "^5",
+		"guzzlehttp/guzzle": "^7",
 		"staabm/annotate-pull-request-from-checkstyle": "^1.1.0"
 	},
 	"autoload-dev": {

package.json

@@ -13,21 +13,21 @@
 		"stylelint:fix": "stylelint 'src/**/*.vue' 'css/**/*.scss' --fix"
 	},
 	"dependencies": {
-		"@nextcloud/axios": "^1.6.0",
+		"@nextcloud/axios": "^1.7.0",
 		"@nextcloud/dialogs": "^3.1.2",
-		"@nextcloud/event-bus": "^2.0.0",
+		"@nextcloud/event-bus": "^2.1.1",
 		"@nextcloud/moment": "^1.1.1",
 		"@nextcloud/router": "^2.0.0",
-		"@nextcloud/vue": "^3.10.1",
+		"@nextcloud/vue": "^4.2.0",
 		"@nextcloud/vue-dashboard": "^2.0.1",
 		"diff": "^5.0.0",
 		"easymde": "^2.15.0",
-		"markdown-it": "^12.1.0",
+		"markdown-it": "^12.2.0",
 		"vue": "^2.6.14",
 		"vue-fragment": "1.5.1",
-		"vue-material-design-icons": "^4.12.1",
+		"vue-material-design-icons": "^4.13.0",
 		"vue-observe-visibility": "^1.0.0",
-		"vue-router": "^3.5.2",
+		"vue-router": "^3.5.3",
 		"vuex": "^3.6.2"
 	},
 	"browserslist": [
@@ -39,9 +39,9 @@
 	},
 	"devDependencies": {
 		"@nextcloud/babel-config": "^1.0.0",
-		"@nextcloud/browserslist-config": "^2.1.0",
-		"@nextcloud/eslint-config": "^6.0.0",
+		"@nextcloud/browserslist-config": "^2.2.0",
+		"@nextcloud/eslint-config": "^6.1.0",
 		"@nextcloud/stylelint-config": "^1.0.0-beta.0",
-		"@nextcloud/webpack-vue-config": "^4.1.0"
+		"@nextcloud/webpack-vue-config": "^4.1.4"
 	}
 }

src/components/ConflictSolution.vue

@@ -3,7 +3,7 @@
 		<div class="text">
 			<pre v-for="(l, i) in diff" :key="i" :class="l.className">{{ l.line }}</pre>
 		</div>
-		<button @click="$emit('onChooseSolution')">
+		<button @click="$emit('on-choose-solution')">
 			{{ button }}
 		</button>
 	</div>