diff --git a/apps/comments/src/components/Comment.vue b/apps/comments/src/components/Comment.vue index df9a22a170917..3f9817f299373 100644 --- a/apps/comments/src/components/Comment.vue +++ b/apps/comments/src/components/Comment.vue @@ -104,13 +104,7 @@ import { getCurrentUser } from '@nextcloud/auth' import moment from '@nextcloud/moment' -import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton' -import NcActions from '@nextcloud/vue/dist/Components/NcActions' -import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator' -import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar' -import NcButton from '@nextcloud/vue/dist/Components/NcButton' -import NcRichContenteditable from '@nextcloud/vue/dist/Components/NcRichContenteditable' -import RichEditorMixin from '@nextcloud/vue/dist/Mixins/richEditor' +import { NcActionButton, NcActions, NcActionSeparator, NcAvatar, NcButton, NcRichContenteditable, richEditor } from '@nextcloud/vue' import ArrowRight from 'vue-material-design-icons/ArrowRight' import Moment from './Moment' @@ -129,7 +123,7 @@ export default { Moment, NcRichContenteditable, }, - mixins: [RichEditorMixin, CommentMixin], + mixins: [richEditor, CommentMixin], inheritAttrs: false, diff --git a/apps/comments/src/views/Comments.vue b/apps/comments/src/views/Comments.vue index 288fe44e96bba..7b9c6071ece94 100644 --- a/apps/comments/src/views/Comments.vue +++ b/apps/comments/src/views/Comments.vue @@ -86,8 +86,7 @@ import axios from '@nextcloud/axios' import VTooltip from 'v-tooltip' import Vue from 'vue' -import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent' -import NcButton from '@nextcloud/vue/dist/Components/NcButton' +import { NcEmptyContent, NcButton } from '@nextcloud/vue' import RefreshIcon from 'vue-material-design-icons/Refresh' import MessageReplyTextIcon from 'vue-material-design-icons/MessageReplyText' import AlertCircleOutlineIcon from 'vue-material-design-icons/AlertCircleOutline' diff --git a/apps/dashboard/src/DashboardApp.vue b/apps/dashboard/src/DashboardApp.vue index 607e677fa7f40..87c6e454d84f8 100644 --- a/apps/dashboard/src/DashboardApp.vue +++ b/apps/dashboard/src/DashboardApp.vue @@ -92,9 +92,8 @@ import { generateUrl } from '@nextcloud/router' import { getCurrentUser } from '@nextcloud/auth' import { loadState } from '@nextcloud/initial-state' import axios from '@nextcloud/axios' -import NcButton from '@nextcloud/vue/dist/Components/NcButton' +import { NcButton, NcModal } from '@nextcloud/vue' import Draggable from 'vuedraggable' -import NcModal from '@nextcloud/vue/dist/Components/NcModal' import Pencil from 'vue-material-design-icons/Pencil.vue' import Vue from 'vue' diff --git a/apps/dashboard/src/main.js b/apps/dashboard/src/main.js index dc276959b118a..27304603f7fbe 100644 --- a/apps/dashboard/src/main.js +++ b/apps/dashboard/src/main.js @@ -23,7 +23,7 @@ import Vue from 'vue' import DashboardApp from './DashboardApp.vue' import { translate as t } from '@nextcloud/l10n' -import VTooltip from '@nextcloud/vue/dist/Directives/Tooltip' +import { Tooltip as VTooltip } from '@nextcloud/vue' import { getRequestToken } from '@nextcloud/auth' // eslint-disable-next-line camelcase diff --git a/apps/dav/src/views/Availability.vue b/apps/dav/src/views/Availability.vue index e0128a59e0a07..76e3853ae5682 100644 --- a/apps/dav/src/views/Availability.vue +++ b/apps/dav/src/views/Availability.vue @@ -47,14 +47,12 @@ import { findScheduleInboxAvailability, getEmptySlots, saveScheduleInboxAvailability, -} from '../service/CalendarService' +} from '../service/CalendarService.js' import { enableUserStatusAutomation, disableUserStatusAutomation, -} from '../service/PreferenceService' -import NcButton from '@nextcloud/vue/dist/Components/NcButton' -import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch' -import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection' +} from '../service/PreferenceService.js' +import { NcButton, NcCheckboxRadioSwitch, NcSettingsSection } from '@nextcloud/vue' import NcTimezonePicker from '@nextcloud/vue/dist/Components/NcTimezonePicker' export default { diff --git a/apps/dav/src/views/CalDavSettings.vue b/apps/dav/src/views/CalDavSettings.vue index 776f32bff3601..4c32ed491f3a2 100644 --- a/apps/dav/src/views/CalDavSettings.vue +++ b/apps/dav/src/views/CalDavSettings.vue @@ -75,8 +75,7 @@ import axios from '@nextcloud/axios' import { generateUrl } from '@nextcloud/router' import { loadState } from '@nextcloud/initial-state' -import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection' -import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch' +import { NcSettingsSection, NcCheckboxRadioSwitch } from '@nextcloud/vue' const userSyncCalendarsDocUrl = loadState('dav', 'userSyncCalendarsDocUrl', '#') diff --git a/apps/federatedfilesharing/src/components/AdminSettings.vue b/apps/federatedfilesharing/src/components/AdminSettings.vue index 678e47012c2c4..8b163f317ad02 100644 --- a/apps/federatedfilesharing/src/components/AdminSettings.vue +++ b/apps/federatedfilesharing/src/components/AdminSettings.vue @@ -65,8 +65,7 @@