Bump @nextcloud/vue to 6.0.0-beta.3 and related

Update @nextcloud/vue to 6.0.0-beta.3
Update vue and vue-template-compiler to 2.7.8
Update calendar-availability-vue to 0.5.0-beta.1 to fix conflicts.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

4 files changed, 18 insertions, 18 deletions

diff --git a/core/src/components/login/LoginButton.vue b/core/src/components/login/LoginButton.vue
index 0b9afd58685..a29314beb2f 100644
--- a/core/src/components/login/LoginButton.vue
+++ b/core/src/components/login/LoginButton.vue
@@ -20,7 +20,7 @@
   -->
 
 <template>
-	<Button type="primary"
+	<ButtonVue type="primary"
 		native-type="submit"
 		:wide="true"
 		@click="$emit('click')">
@@ -29,18 +29,18 @@
 			<div v-if="loading" class="submit-wrapper__icon icon-loading-small-dark" />
 			<ArrowRight v-else class="submit-wrapper__icon" />
 		</template>
-	</Button>
+	</ButtonVue>
 </template>
 
 <script>
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import ArrowRight from 'vue-material-design-icons/ArrowRight.vue'
 
 export default {
 	name: 'LoginButton',
 	components: {
 		ArrowRight,
-		Button,
+		ButtonVue,
 	},
 	props: {
 		value: {
diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 9f245f2914c..5bea7df40d3 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -84,7 +84,7 @@
 					required>
 				<label for="password"
 					class="infield">{{ t('core', 'Password') }}</label>
-				<Button class="toggle-password"
+				<ButtonVue class="toggle-password"
 					type="tertiary-no-background"
 					:aria-label="isPasswordHidden ? t('core', 'Show password') : t('core', 'Hide password')"
 					@click.stop.prevent="togglePassword">
@@ -92,7 +92,7 @@
 						<Eye v-if="isPasswordHidden" :size="20" />
 						<EyeOff v-else :size="20" />
 					</template>
-				</Button>
+				</ButtonVue>
 			</p>
 
 			<LoginButton :loading="loading" />
@@ -136,7 +136,7 @@
 import jstz from 'jstimezonedetect'
 import { generateUrl, imagePath } from '@nextcloud/router'
 
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import Eye from 'vue-material-design-icons/Eye'
 import EyeOff from 'vue-material-design-icons/EyeOff'
 
@@ -146,7 +146,7 @@ export default {
 	name: 'LoginForm',
 
 	components: {
-		Button,
+		ButtonVue,
 		Eye,
 		EyeOff,
 		LoginButton,
diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 19761069644..3bc046c89a6 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -54,19 +54,19 @@
 		</div>
 
 		<div class="dialog-row">
-			<Button v-if="showInstallButton"
+			<ButtonVue v-if="showInstallButton"
 				type="tertiary"
 				role="link"
 				href="defaultPageUrl"
 				@click="goTo(defaultPageUrl)">
 				{{ t('core', 'Skip') }}
-			</Button>
+			</ButtonVue>
 
-			<Button v-if="showInstallButton"
+			<ButtonVue v-if="showInstallButton"
 				type="primary"
 				@click.stop.prevent="installApps">
 				{{ t('core', 'Install recommended apps') }}
-			</Button>
+			</ButtonVue>
 		</div>
 	</div>
 </template>
@@ -78,7 +78,7 @@ import { loadState } from '@nextcloud/initial-state'
 import pLimit from 'p-limit'
 import { translate as t } from '@nextcloud/l10n'
 
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 import logger from '../../logger'
 
@@ -114,7 +114,7 @@ const defaultPageUrl = loadState('core', 'defaultPageUrl')
 export default {
 	name: 'RecommendedApps',
 	components: {
-		Button,
+		ButtonVue,
 	},
 	data() {
 		return {
diff --git a/core/src/views/Login.vue b/core/src/views/Login.vue
index 262c9e2973f..0b20f74a87a 100644
--- a/core/src/views/Login.vue
+++ b/core/src/views/Login.vue
@@ -105,7 +105,7 @@
 		</div>
 
 		<div id="alternative-logins" class="alternative-logins">
-			<Button v-for="(alternativeLogin, index) in alternativeLogins"
+			<ButtonVue v-for="(alternativeLogin, index) in alternativeLogins"
 				:key="index"
 				type="primary"
 				:wide="true"
@@ -114,7 +114,7 @@
 				:href="alternativeLogin.href"
 				@click="goTo(alternativeLogin.href)">
 				{{ alternativeLogin.name }}
-			</Button>
+			</ButtonVue>
 		</div>
 	</div>
 </template>
@@ -127,7 +127,7 @@ import LoginForm from '../components/login/LoginForm.vue'
 import PasswordLessLoginForm from '../components/login/PasswordLessLoginForm.vue'
 import ResetPassword from '../components/login/ResetPassword.vue'
 import UpdatePassword from '../components/login/UpdatePassword.vue'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 const query = queryString.parse(location.search)
 if (query.clear === '1') {
@@ -148,7 +148,7 @@ export default {
 		PasswordLessLoginForm,
 		ResetPassword,
 		UpdatePassword,
-		Button,
+		ButtonVue,
 	},
 
 	data() {