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>

apps/comments/src/components/Comment.vue

@@ -71,7 +71,7 @@
 				:value="localMessage"
 				@update:value="updateLocalMessage"
 				@submit="onSubmit" />
-			<Button class="comment__submit"
+			<ButtonVue class="comment__submit"
 				type="tertiary-no-background"
 				native-type="submit"
 				:aria-label="t('comments', 'Post comment')"
@@ -81,7 +81,7 @@
 					<span v-if="loading" class="icon-loading-small" />
 					<ArrowRight v-else :size="20" />
 				</template>
-			</Button>
+			</ButtonVue>
 		</div>
 
 		<!-- Message content -->
@@ -103,7 +103,7 @@ import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionSeparator from '@nextcloud/vue/dist/Components/ActionSeparator'
 import Avatar from '@nextcloud/vue/dist/Components/Avatar'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import RichContenteditable from '@nextcloud/vue/dist/Components/RichContenteditable'
 import RichEditorMixin from '@nextcloud/vue/dist/Mixins/richEditor'
 import ArrowRight from 'vue-material-design-icons/ArrowRight'
@@ -120,7 +120,7 @@ export default {
 		ActionSeparator,
 		ArrowRight,
 		Avatar,
-		Button,
+		ButtonVue,
 		Moment,
 		RichContenteditable,
 	},

apps/dashboard/src/DashboardApp.vue

@@ -28,12 +28,12 @@
 		</Draggable>
 
 		<div class="footer">
-			<Button @click="showModal">
+			<ButtonVue @click="showModal">
 				<template #icon>
 					<Pencil :size="20" />
 				</template>
 				{{ t('dashboard', 'Customize') }}
-			</Button>
+			</ButtonVue>
 		</div>
 
 		<Modal v-if="modal" size="large" @close="closeModal">
@@ -97,7 +97,7 @@ import { generateUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
 import axios from '@nextcloud/axios'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import Draggable from 'vuedraggable'
 import Modal from '@nextcloud/vue/dist/Components/Modal'
 import Pencil from 'vue-material-design-icons/Pencil.vue'
@@ -129,7 +129,7 @@ export default {
 	name: 'DashboardApp',
 	components: {
 		BackgroundSettings,
-		Button,
+		ButtonVue,
 		Draggable,
 		Modal,
 		Pencil,

apps/dav/src/views/Availability.vue

@@ -28,11 +28,11 @@
 			{{ $t('dav', 'Automatically set user status to "Do not disturb" outside of availability to mute all notifications.') }}
 		</CheckboxRadioSwitch>
 
-		<Button :disabled="loading || saving"
+		<ButtonVue :disabled="loading || saving"
 			type="primary"
 			@click="save">
 			{{ $t('dav', 'Save') }}
-		</Button>
+		</ButtonVue>
 	</SettingsSection>
 </template>
 
@@ -53,7 +53,7 @@ import {
 	disableUserStatusAutomation,
 } from '../service/PreferenceService'
 import jstz from 'jstimezonedetect'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
 import TimezonePicker from '@nextcloud/vue/dist/Components/TimezonePicker'
@@ -61,7 +61,7 @@ import TimezonePicker from '@nextcloud/vue/dist/Components/TimezonePicker'
 export default {
 	name: 'Availability',
 	components: {
-		Button,
+		ButtonVue,
 		CheckboxRadioSwitch,
 		CalendarAvailability,
 		SettingsSection,

apps/federatedfilesharing/src/components/PersonalSettings.vue

@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		<p class="cloud-id-text">
 			{{ t('federatedfilesharing', 'Your Federated Cloud ID:') }}
 			<strong id="cloudid">{{ cloudId }}</strong>
-			<Button ref="clipboard"
+			<ButtonVue ref="clipboard"
 				v-tooltip="copyLinkTooltip"
 				class="clipboard"
 				type="tertiary-no-background"
@@ -31,24 +31,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 				<template #icon>
 					<Clipboard :size="20" />
 				</template>
-			</Button>
+			</ButtonVue>
 		</p>
 
 		<p class="social-button">
 			{{ t('federatedfilesharing', 'Share it so your friends can share files with you:') }}<br>
-			<Button @click="goTo(shareFacebookUrl)">
+			<ButtonVue @click="goTo(shareFacebookUrl)">
 				{{ t('federatedfilesharing', 'Facebook') }}
 				<template #icon>
 					<Facebook :size="20" />
 				</template>
-			</Button>
-			<Button @click="goTo(shareTwitterUrl)">
+			</ButtonVue>
+			<ButtonVue @click="goTo(shareTwitterUrl)">
 				{{ t('federatedfilesharing', 'Twitter') }}
 				<template #icon>
 					<Twitter :size="20" />
 				</template>
-			</Button>
-			<Button @click="goTo(shareDiasporaUrl)">
+			</ButtonVue>
+			<ButtonVue @click="goTo(shareDiasporaUrl)">
 				{{ t('federatedfilesharing', 'Diaspora') }}
 				<template #icon>
 					<svg width="20"
@@ -56,13 +56,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 						viewBox="-10 -5 1034 1034"
 						xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M502 197q-96 0-96.5 1.5t-1.5 137-1.5 138-2 2.5T266 432.5 132.5 390t-30 94T74 578l232 77q21 8 21 10t-79.5 117.5T168 899t79.5 56.5T328 1011t81-110 82-110 41 55l83 115q43 60 44 60t79.5-58 79-59-76-112.5-76-113.5T795 632.5t129.5-44-28-94T867 400t-128 42-128.5 43-2.5-7.5-1-38.5l-3-108q-4-133-5-133.5t-97-.5z" /></svg>
 				</template>
-			</Button>
-			<Button @click="showHtml = !showHtml">
+			</ButtonVue>
+			<ButtonVue @click="showHtml = !showHtml">
 				<template #icon>
 					<Web :size="20" />
 				</template>
 				{{ t('federatedfilesharing', 'Add to your website') }}
-			</Button>
+			</ButtonVue>
 		</p>
 
 		<template v-if="showHtml">
@@ -89,7 +89,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 import { showError } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import Twitter from 'vue-material-design-icons/Twitter'
 import Facebook from 'vue-material-design-icons/Facebook'
 import Web from 'vue-material-design-icons/Web'
@@ -99,7 +99,7 @@ import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 export default {
 	name: 'PersonalSettings',
 	components: {
-		Button,
+		ButtonVue,
 		SettingsSection,
 		Twitter,
 		Facebook,

apps/files/src/components/TransferOwnershipDialogue.vue

@@ -25,12 +25,12 @@
 		<form @submit.prevent="submit">
 			<p class="transfer-select-row">
 				<span>{{ readableDirectory }}</span>
-				<Button v-if="directory === undefined" @click.prevent="start">
+				<ButtonVue v-if="directory === undefined" @click.prevent="start">
 					{{ t('files', 'Choose file or folder to transfer') }}
-				</Button>
-				<Button v-else @click.prevent="start">
+				</ButtonVue>
+				<ButtonVue v-else @click.prevent="start">
 					{{ t('files', 'Change') }}
-				</Button>
+				</ButtonVue>
 				<span class="error">{{ directoryPickerError }}</span>
 			</p>
 			<p class="new-owner-row">
@@ -72,7 +72,7 @@ import { generateOcsUrl } from '@nextcloud/router'
 import { getFilePickerBuilder, showSuccess } from '@nextcloud/dialogs'
 import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 import Vue from 'vue'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 import logger from '../logger'
 
@@ -87,7 +87,7 @@ export default {
 	name: 'TransferOwnershipDialogue',
 	components: {
 		Multiselect,
-		Button,
+		ButtonVue,
 	},
 	data() {
 		return {

apps/oauth2/src/App.vue

@@ -54,9 +54,9 @@
 				type="url"
 				name="redirectUri"
 				:placeholder="t('oauth2', 'Redirection URI')">
-			<Button class="inline-button">
+			<ButtonVue class="inline-button">
 				{{ t('oauth2', 'Add') }}
-			</Button>
+			</ButtonVue>
 		</form>
 	</SettingsSection>
 </template>
@@ -67,7 +67,7 @@ import OAuthItem from './components/OAuthItem'
 import { generateUrl } from '@nextcloud/router'
 import { getCapabilities } from '@nextcloud/capabilities'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import { loadState } from '@nextcloud/initial-state'
 
 export default {
@@ -75,7 +75,7 @@ export default {
 	components: {
 		OAuthItem,
 		SettingsSection,
-		Button,
+		ButtonVue,
 	},
 	props: {
 		clients: {

apps/oauth2/src/components/OAuthItem.vue

@@ -42,14 +42,14 @@
 			</table>
 		</td>
 		<td class="action-column">
-			<Button type="tertiary-no-background"
+			<ButtonVue type="tertiary-no-background"
 				:aria-label="t('oauth2', 'Delete')"
 				@click="$emit('delete', id)">
 				<template #icon>
 					<Delete :size="20"
 						:title="t('oauth2', 'Delete')" />
 				</template>
-			</Button>
+			</ButtonVue>
 		</td>
 	</tr>
 </template>
@@ -57,13 +57,13 @@
 <script>
 
 import Delete from 'vue-material-design-icons/Delete'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 export default {
 	name: 'OAuthItem',
 	components: {
 		Delete,
-		Button,
+		ButtonVue,
 	},
 	props: {
 		client: {

apps/settings/src/components/AdminTwoFactor.vue

@@ -53,12 +53,12 @@
 			</p>
 		</template>
 		<p class="top-margin">
-			<Button v-if="dirty"
+			<ButtonVue v-if="dirty"
 				type="primary"
 				:disabled="loading"
 				@click="saveChanges">
 				{{ t('settings', 'Save changes') }}
-			</Button>
+			</ButtonVue>
 		</p>
 	</SettingsSection>
 </template>
@@ -66,7 +66,7 @@
 <script>
 import axios from '@nextcloud/axios'
 import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
 import { loadState } from '@nextcloud/initial-state'
@@ -78,7 +78,7 @@ export default {
 	name: 'AdminTwoFactor',
 	components: {
 		Multiselect,
-		Button,
+		ButtonVue,
 		CheckboxRadioSwitch,
 		SettingsSection,
 	},

apps/settings/src/components/AppList.vue

@@ -26,12 +26,12 @@
 			<template v-if="useListView">
 				<div v-if="showUpdateAll" class="toolbar">
 					{{ n('settings', '%n app has an update available', '%n apps have an update available', counter) }}
-					<Button v-if="showUpdateAll"
+					<ButtonVue v-if="showUpdateAll"
 						id="app-list-update-all"
 						type="primary"
 						@click="updateAll">
 						{{ n('settings', 'Update', 'Update all', counter) }}
-					</Button>
+					</ButtonVue>
 				</div>
 
 				<div v-if="!showUpdateAll" class="toolbar">
@@ -107,13 +107,13 @@
 import AppItem from './AppList/AppItem'
 import PrefixMixin from './PrefixMixin'
 import pLimit from 'p-limit'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 export default {
 	name: 'AppList',
 	components: {
 		AppItem,
-		Button,
+		ButtonVue,
 	},
 	mixins: [PrefixMixin],
 	props: ['category', 'app', 'search'],

apps/settings/src/components/AuthTokenSetupDialogue.vue

@@ -28,11 +28,11 @@
 			:disabled="loading"
 			:placeholder="t('settings', 'App name')"
 			@keydown.enter="submit">
-		<Button :disabled="loading || deviceName.length === 0"
+		<ButtonVue :disabled="loading || deviceName.length === 0"
 			type="primary"
 			@click="submit">
 			{{ t('settings', 'Create new app password') }}
-		</Button>
+		</ButtonVue>
 	</div>
 	<div v-else class="spacing">
 		{{ t('settings', 'Use the credentials below to configure your app or device.') }}
@@ -63,9 +63,9 @@
 				class="icon icon-clippy"
 				@mouseover="hoveringCopyButton = true"
 				@mouseleave="hoveringCopyButton = false" />
-			<Button @click="reset">
+			<ButtonVue @click="reset">
 				{{ t('settings', 'Done') }}
-			</Button>
+			</ButtonVue>
 		</div>
 		<div class="app-password-row">
 			<span class="app-password-label" />
@@ -83,13 +83,13 @@
 import QR from '@chenfengyuan/vue-qrcode'
 import confirmPassword from '@nextcloud/password-confirmation'
 import { getRootUrl } from '@nextcloud/router'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 export default {
 	name: 'AuthTokenSetupDialogue',
 	components: {
 		QR,
-		Button,
+		ButtonVue,
 	},
 	props: {
 		add: {

apps/settings/src/components/Encryption.vue

@@ -43,10 +43,10 @@
 			<p class="margin-bottom">
 				{{ t('settings', 'This is the final warning: Do you really want to enable encryption?') }}
 			</p>
-			<Button type="primary"
+			<ButtonVue type="primary"
 				@click="enableEncryption()">
 				{{ t('settings', "Enable encryption") }}
-			</Button>
+			</ButtonVue>
 		</div>
 
 		<div v-if="encryptionEnabled">
@@ -78,7 +78,7 @@
 <script>
 import axios from '@nextcloud/axios'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
 import { loadState } from '@nextcloud/initial-state'
 import { getLoggerBuilder } from '@nextcloud/logger'
@@ -97,7 +97,7 @@ export default {
 	components: {
 		CheckboxRadioSwitch,
 		SettingsSection,
-		Button,
+		ButtonVue,
 	},
 	data() {
 		const encryptionModules = loadState('settings', 'encryption-modules')

apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue

@@ -35,7 +35,7 @@
 		</template>
 
 		<template v-if="isEditable && isMultiValueSupported">
-			<Button type="tertiary"
+			<ButtonVue type="tertiary"
 				:disabled="!isValidSection"
 				:aria-label="t('settings', 'Add additional email')"
 				@click.stop.prevent="onAddAdditional">
@@ -43,14 +43,14 @@
 					<Plus :size="20" />
 				</template>
 				{{ t('settings', 'Add') }}
-			</Button>
+			</ButtonVue>
 		</template>
 	</h3>
 </template>
 
 <script>
 import FederationControl from './FederationControl'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import Plus from 'vue-material-design-icons/Plus'
 import { ACCOUNT_PROPERTY_READABLE_ENUM, ACCOUNT_SETTING_PROPERTY_READABLE_ENUM, PROFILE_READABLE_ENUM } from '../../../constants/AccountPropertyConstants'
 
@@ -59,7 +59,7 @@ export default {
 
 	components: {
 		FederationControl,
-		Button,
+		ButtonVue,
 		Plus,
 	},
 

apps/settings/src/components/UserList.vue

@@ -142,12 +142,12 @@
 				<div v-if="showConfig.showUserBackend" class="userBackend" />
 				<div v-if="showConfig.showLastLogin" class="lastLogin" />
 				<div class="user-actions">
-					<Button id="newsubmit"
+					<ButtonVue id="newsubmit"
 						type="primary"
 						native-type="submit"
 						value="">
 						{{ t('settings', 'Add a new user') }}
-					</Button>
+					</ButtonVue>
 				</div>
 			</form>
 		</Modal>
@@ -235,7 +235,7 @@ import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import InfiniteLoading from 'vue-infinite-loading'
 import Vue from 'vue'
 import Modal from '@nextcloud/vue/dist/Components/Modal'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 
 import userRow from './UserList/UserRow'
@@ -269,7 +269,7 @@ export default {
 		userRow,
 		Multiselect,
 		InfiniteLoading,
-		Button,
+		ButtonVue,
 	},
 	props: {
 		users: {

apps/user_status/src/components/SetStatusModal.vue

@@ -78,7 +78,7 @@
 import { showError } from '@nextcloud/dialogs'
 import EmojiPicker from '@nextcloud/vue/dist/Components/EmojiPicker'
 import Modal from '@nextcloud/vue/dist/Components/Modal'
-import ButtonVue from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import { getAllStatusOptions } from '../services/statusOptionsService'
 import OnlineStatusMixin from '../mixins/OnlineStatusMixin'
 import PredefinedStatusesList from './PredefinedStatusesList'

apps/workflowengine/src/components/Operation.vue

@@ -4,9 +4,9 @@
 		<div class="actions__item__description">
 			<h3>{{ operation.name }}</h3>
 			<small>{{ operation.description }}</small>
-			<Button v-if="colored">
+			<ButtonVue v-if="colored">
 				{{ t('workflowengine', 'Add new flow') }}
-			</Button>
+			</ButtonVue>
 		</div>
 		<div class="actions__item_options">
 			<slot />
@@ -15,12 +15,12 @@
 </template>
 
 <script>
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 export default {
 	name: 'Operation',
 	components: {
-		Button,
+		ButtonVue,
 	},
 	props: {
 		operation: {

apps/workflowengine/src/components/Rule.vue

@@ -31,19 +31,19 @@
 					@input="updateOperation" />
 			</Operation>
 			<div class="buttons">
-				<Button v-if="rule.id < -1 || dirty" @click="cancelRule">
+				<ButtonVue v-if="rule.id < -1 || dirty" @click="cancelRule">
 					{{ t('workflowengine', 'Cancel') }}
-				</Button>
-				<Button v-else-if="!dirty" @click="deleteRule">
+				</ButtonVue>
+				<ButtonVue v-else-if="!dirty" @click="deleteRule">
 					{{ t('workflowengine', 'Delete') }}
-				</Button>
-				<Button :type="ruleStatus.type"
+				</ButtonVue>
+				<ButtonVue :type="ruleStatus.type"
 					@click="saveRule">
 					<template #icon>
 						<component :is="ruleStatus.icon" :size="20" />
 					</template>
 					{{ ruleStatus.title }}
-				</Button>
+				</ButtonVue>
 			</div>
 			<p v-if="error" class="error-message">
 				{{ error }}
@@ -56,7 +56,7 @@
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-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'
 import CheckMark from 'vue-material-design-icons/Check.vue'
 import Close from 'vue-material-design-icons/Close.vue'
@@ -68,7 +68,7 @@ import Operation from './Operation'
 export default {
 	name: 'Rule',
 	components: {
-		Operation, Check, Event, Actions, ActionButton, Button, ArrowRight, CheckMark, Close,
+		Operation, Check, Event, Actions, ActionButton, ButtonVue, ArrowRight, CheckMark, Close,
 	},
 	directives: {
 		Tooltip,

apps/workflowengine/src/components/Workflow.vue

@@ -26,13 +26,13 @@
 			</transition-group>
 
 			<div v-if="hasMoreOperations" class="actions__more">
-				<Button @click="showMoreOperations = !showMoreOperations">
+				<ButtonVue @click="showMoreOperations = !showMoreOperations">
 					<template #icon>
 						<MenuUp v-if="showMoreOperations" :size="20" />
 						<MenuDown v-else :size="20" />
 					</template>
 					{{ showMoreOperations ? t('workflowengine', 'Show less') : t('workflowengine', 'Show more') }}
-				</Button>
+				</ButtonVue>
 			</div>
 
 			<h2 v-if="scope === 0" class="configured-flows">
@@ -53,7 +53,7 @@
 import Rule from './Rule'
 import Operation from './Operation'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import { mapGetters, mapState } from 'vuex'
 import { generateUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
@@ -65,7 +65,7 @@ const ACTION_LIMIT = 3
 export default {
 	name: 'Workflow',
 	components: {
-		Button,
+		ButtonVue,
 		MenuDown,
 		MenuUp,
 		Operation,

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: {

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,

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 {

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() {

dist/icons.css

@@ -1585,7 +1585,7 @@ body .nav-icon-systemtagsfilter {
     --icon-view-previous-dark: var(--original-icon-view-previous-white);
   }
 }
-[data-themes*=light] {
+body[data-themes*=light] {
   --icon-add-dark: var(--original-icon-add-dark);
   --icon-add-white: var(--original-icon-add-white);
   --icon-address-dark: var(--original-icon-address-dark);
@@ -1794,7 +1794,7 @@ body .nav-icon-systemtagsfilter {
   --icon-view-previous-white: var(--original-icon-view-previous-white);
 }
 
-[data-themes*=dark] {
+body[data-themes*=dark] {
   --icon-add-white: var(--original-icon-add-dark);
   --icon-add-dark: var(--original-icon-add-white);
   --icon-address-white: var(--original-icon-address-dark);

package.json

@@ -32,7 +32,7 @@
     "@chenfengyuan/vue-qrcode": "^1.0.2",
     "@nextcloud/auth": "^1.3.0",
     "@nextcloud/axios": "^1.10.0",
-    "@nextcloud/calendar-availability-vue": "^0.3.1",
+    "@nextcloud/calendar-availability-vue": "^0.5.0-beta.1",
     "@nextcloud/capabilities": "^1.0.4",
     "@nextcloud/dialogs": "^3.1.4",
     "@nextcloud/event-bus": "^2.1.1",
@@ -46,7 +46,7 @@
     "@nextcloud/paths": "^2.1.0",
     "@nextcloud/router": "^2.0.0",
     "@nextcloud/sharing": "^0.1.0",
-    "@nextcloud/vue": "^5.4.0",
+    "@nextcloud/vue": "^6.0.0-beta.3",
     "@nextcloud/vue-dashboard": "^2.0.1",
     "@vue/cli-plugin-unit-jest": "^4.5.15",
     "autosize": "^5.0.1",
@@ -88,7 +88,7 @@
     "url-search-params-polyfill": "^8.1.1",
     "v-click-outside": "^3.2.0",
     "v-tooltip": "^2.1.3",
-    "vue": "^2.6.14",
+    "vue": "^2.7.10",
     "vue-click-outside": "^1.1.0",
     "vue-clipboard2": "^0.3.3",
     "vue-infinite-loading": "^2.4.5",
@@ -132,7 +132,7 @@
     "karma-spec-reporter": "^0.0.34",
     "karma-viewport": "^1.0.9",
     "node-sass": "~7.0.1",
-    "puppeteer": "^16.2.0",
+    "puppeteer": "^15.5.0",
     "regextras": "^0.8.0",
     "sass": "^1.52.1",
     "sass-loader": "^12.6.0",
@@ -140,7 +140,7 @@
     "style-loader": "^3.3.1",
     "vue-jest": "^4.0.1",
     "vue-loader": "^15.9.8",
-    "vue-template-compiler": "^2.6.14",
+    "vue-template-compiler": "^2.7.10",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"