From 73ca6a28f770a69ecfbf6e9625277a563c4b75a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 26 Jan 2023 14:04:55 +0100
Subject: [PATCH] perf(bundles): Improve import to only load components once
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/comments/src/components/Comment.vue       | 14 +++++++-------
 apps/comments/src/views/Comments.vue           |  4 ++--
 apps/dashboard/src/DashboardApp.vue            |  4 ++--
 apps/dashboard/src/main.js                     |  2 +-
 apps/dav/src/views/Availability.vue            |  8 ++++----
 apps/dav/src/views/CalDavSettings.vue          |  4 ++--
 .../src/components/AdminSettings.vue           |  4 ++--
 .../src/components/PersonalSettings.vue        |  4 ++--
 apps/files/src/components/NavigationQuota.vue  |  4 ++--
 apps/files/src/components/SidebarTab.vue       |  4 ++--
 .../components/TransferOwnershipDialogue.vue   |  4 ++--
 apps/files/src/views/Navigation.vue            |  4 ++--
 apps/files/src/views/Settings.vue              |  8 ++++----
 apps/files/src/views/Sidebar.vue               |  6 +++---
 apps/files/src/views/TemplatePicker.vue        |  4 ++--
 .../src/collaborationresources.js              |  4 ++--
 .../src/components/SharePermissionsEditor.vue  |  6 +++---
 .../src/components/SharingEntry.vue            | 12 ++++++------
 .../src/components/SharingEntryInherited.vue   |  8 ++++----
 .../src/components/SharingEntryInternal.vue    |  2 +-
 .../src/components/SharingEntryLink.vue        | 18 +++++++++---------
 .../src/components/SharingEntrySimple.vue      |  2 +-
 .../src/components/SharingInput.vue            |  2 +-
 .../src/views/SharingInherited.vue             |  2 +-
 apps/files_sharing/src/views/SharingTab.vue    |  2 +-
 apps/files_versions/src/views/VersionTab.vue   |  8 ++++----
 apps/oauth2/src/App.vue                        |  4 ++--
 apps/oauth2/src/components/OAuthItem.vue       |  2 +-
 .../src/components/AdminDelegating.vue         |  2 +-
 .../components/AdminDelegation/GroupSelect.vue |  2 +-
 .../settings/src/components/AdminTwoFactor.vue |  8 ++++----
 apps/settings/src/components/AppDetails.vue    |  2 +-
 apps/settings/src/components/AppList.vue       |  2 +-
 .../src/components/AppList/AppItem.vue         |  2 +-
 .../src/components/AuthTokenSetupDialogue.vue  |  2 +-
 .../components/BasicSettings/BackgroundJob.vue |  6 +++---
 .../BasicSettings/ProfileSettings.vue          |  2 +-
 apps/settings/src/components/Encryption.vue    |  6 +++---
 apps/settings/src/components/GroupListItem.vue |  8 ++++----
 .../src/components/PasswordSection.vue         |  6 +++---
 .../components/PersonalInfo/AvatarSection.vue  |  4 ++--
 .../components/PersonalInfo/DetailsSection.vue |  2 +-
 .../ProfileSection/ProfileCheckbox.vue         |  2 +-
 .../ProfileSection/ProfilePreviewCard.vue      |  2 +-
 .../VisibilityDropdown.vue                     |  2 +-
 .../PersonalInfo/shared/FederationControl.vue  |  2 +-
 .../shared/FederationControlAction.vue         |  2 +-
 .../PersonalInfo/shared/HeaderBar.vue          |  2 +-
 apps/settings/src/components/UserList.vue      |  6 +++---
 .../src/components/UserList/UserRowSimple.vue  |  6 +++---
 .../src/components/WebAuthn/Device.vue         |  4 ++--
 apps/settings/src/views/Apps.vue               | 16 ++++++++--------
 apps/settings/src/views/Users.vue              | 18 +++++++++---------
 .../src/components/AdminSettings.vue           |  4 ++--
 apps/theming/src/UserThemes.vue                |  4 ++--
 .../src/components/BackgroundSettings.vue      |  2 +-
 apps/theming/src/components/ItemPreview.vue    |  2 +-
 .../src/components/UpdateNotification.vue      |  8 ++++----
 .../src/components/ClearAtSelect.vue           |  2 +-
 .../src/components/CustomMessageInput.vue      |  4 ++--
 .../src/components/SetStatusModal.vue          |  4 ++--
 apps/user_status/src/menu.js                   |  2 +-
 apps/user_status/src/views/Dashboard.vue       |  6 +++---
 apps/weather_status/src/App.vue                | 12 ++++++------
 apps/workflowengine/src/components/Check.vue   |  6 +++---
 .../src/components/Checks/FileMimeType.vue     |  2 +-
 .../src/components/Checks/FileSystemTag.vue    |  2 +-
 .../src/components/Checks/RequestTime.vue      |  2 +-
 .../src/components/Checks/RequestURL.vue       |  2 +-
 .../src/components/Checks/RequestUserAgent.vue |  2 +-
 .../src/components/Checks/RequestUserGroup.vue |  2 +-
 apps/workflowengine/src/components/Event.vue   |  2 +-
 .../src/components/Operation.vue               |  2 +-
 apps/workflowengine/src/components/Rule.vue    |  8 ++++----
 .../workflowengine/src/components/Workflow.vue |  4 ++--
 core/src/components/AppMenu.vue                |  4 ++--
 .../components/UnifiedSearch/SearchResult.vue  |  2 +-
 core/src/components/login/LoginButton.vue      |  2 +-
 core/src/components/login/LoginForm.vue        |  6 +++---
 core/src/components/login/ResetPassword.vue    |  4 ++--
 core/src/components/setup/RecommendedApps.vue  |  2 +-
 core/src/views/ContactsMenu.vue                |  2 +-
 core/src/views/Login.vue                       |  4 ++--
 core/src/views/Profile.vue                     |  6 +++---
 core/src/views/UnifiedSearch.vue               | 10 +++++-----
 core/src/views/UnsupportedBrowser.vue          |  4 ++--
 86 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/apps/comments/src/components/Comment.vue b/apps/comments/src/components/Comment.vue
index df9a22a170917..b01bf98e1be11 100644
--- a/apps/comments/src/components/Comment.vue
+++ b/apps/comments/src/components/Comment.vue
@@ -104,13 +104,13 @@
 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 } from '@nextcloud/vue'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionSeparator } from '@nextcloud/vue'
+import { NcAvatar } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
+import { NcRichContenteditable } from '@nextcloud/vue'
+import { RichEditorMixin } from '@nextcloud/vue'
 import ArrowRight from 'vue-material-design-icons/ArrowRight'
 
 import Moment from './Moment'
diff --git a/apps/comments/src/views/Comments.vue b/apps/comments/src/views/Comments.vue
index 288fe44e96bba..25a06429d0b93 100644
--- a/apps/comments/src/views/Comments.vue
+++ b/apps/comments/src/views/Comments.vue
@@ -86,8 +86,8 @@ 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 } from '@nextcloud/vue'
+import { 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 d550501cade56..f039d70ebf8fd 100644
--- a/apps/dashboard/src/DashboardApp.vue
+++ b/apps/dashboard/src/DashboardApp.vue
@@ -92,9 +92,9 @@ 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 } from '@nextcloud/vue'
 import Draggable from 'vuedraggable'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
+import { NcModal } from '@nextcloud/vue'
 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..7188e1705acf7 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 { 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..eab50278352d5 100644
--- a/apps/dav/src/views/Availability.vue
+++ b/apps/dav/src/views/Availability.vue
@@ -52,10 +52,10 @@ 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'
-import NcTimezonePicker from '@nextcloud/vue/dist/Components/NcTimezonePicker'
+import { NcButton } from '@nextcloud/vue'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcSettingsSection } from '@nextcloud/vue'
+import { NcTimezonePicker } from '@nextcloud/vue'
 
 export default {
 	name: 'Availability',
diff --git a/apps/dav/src/views/CalDavSettings.vue b/apps/dav/src/views/CalDavSettings.vue
index 776f32bff3601..d70bba276015c 100644
--- a/apps/dav/src/views/CalDavSettings.vue
+++ b/apps/dav/src/views/CalDavSettings.vue
@@ -75,8 +75,8 @@
 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 } from '@nextcloud/vue'
+import { 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..3d438d56c3a56 100644
--- a/apps/federatedfilesharing/src/components/AdminSettings.vue
+++ b/apps/federatedfilesharing/src/components/AdminSettings.vue
@@ -65,8 +65,8 @@
 </template>
 
 <script>
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcSettingsSection } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
diff --git a/apps/federatedfilesharing/src/components/PersonalSettings.vue b/apps/federatedfilesharing/src/components/PersonalSettings.vue
index 745c7af9c8dfa..c5302e3fe18d2 100644
--- a/apps/federatedfilesharing/src/components/PersonalSettings.vue
+++ b/apps/federatedfilesharing/src/components/PersonalSettings.vue
@@ -89,8 +89,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcSettingsSection } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
 import Twitter from 'vue-material-design-icons/Twitter'
 import Facebook from 'vue-material-design-icons/Facebook'
 import Web from 'vue-material-design-icons/Web'
diff --git a/apps/files/src/components/NavigationQuota.vue b/apps/files/src/components/NavigationQuota.vue
index bfcbaea37760b..9f1620bef91cf 100644
--- a/apps/files/src/components/NavigationQuota.vue
+++ b/apps/files/src/components/NavigationQuota.vue
@@ -27,8 +27,8 @@ import { debounce, throttle } from 'throttle-debounce'
 import { translate } from '@nextcloud/l10n'
 import axios from '@nextcloud/axios'
 import ChartPie from 'vue-material-design-icons/ChartPie.vue'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcProgressBar from '@nextcloud/vue/dist/Components/NcProgressBar.js'
+import { NcAppNavigationItem } from '@nextcloud/vue'
+import { NcProgressBar } from '@nextcloud/vue'
 
 import logger from '../logger.js'
 import { subscribe } from '@nextcloud/event-bus'
diff --git a/apps/files/src/components/SidebarTab.vue b/apps/files/src/components/SidebarTab.vue
index ac3cfba7d02ab..6e5a514cc6795 100644
--- a/apps/files/src/components/SidebarTab.vue
+++ b/apps/files/src/components/SidebarTab.vue
@@ -39,8 +39,8 @@
 </template>
 
 <script>
-import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
+import { NcAppSidebarTab } from '@nextcloud/vue'
+import { NcEmptyContent } from '@nextcloud/vue'
 
 export default {
 	name: 'SidebarTab',
diff --git a/apps/files/src/components/TransferOwnershipDialogue.vue b/apps/files/src/components/TransferOwnershipDialogue.vue
index 67840b18829b4..a0844eff1ce7f 100644
--- a/apps/files/src/components/TransferOwnershipDialogue.vue
+++ b/apps/files/src/components/TransferOwnershipDialogue.vue
@@ -70,9 +70,9 @@ import axios from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
 import { getFilePickerBuilder, showSuccess } from '@nextcloud/dialogs'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import Vue from 'vue'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcButton } from '@nextcloud/vue'
 
 import logger from '../logger'
 
diff --git a/apps/files/src/views/Navigation.vue b/apps/files/src/views/Navigation.vue
index 040e1482e3257..468a080a9aa46 100644
--- a/apps/files/src/views/Navigation.vue
+++ b/apps/files/src/views/Navigation.vue
@@ -72,8 +72,8 @@ import { translate } from '@nextcloud/l10n'
 
 import axios from '@nextcloud/axios'
 import Cog from 'vue-material-design-icons/Cog.vue'
-import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
+import { NcAppNavigation } from '@nextcloud/vue'
+import { NcAppNavigationItem } from '@nextcloud/vue'
 
 import logger from '../logger.js'
 import Navigation from '../services/Navigation.ts'
diff --git a/apps/files/src/views/Settings.vue b/apps/files/src/views/Settings.vue
index 9a63fea4924d4..c4094a9d25875 100644
--- a/apps/files/src/views/Settings.vue
+++ b/apps/files/src/views/Settings.vue
@@ -70,11 +70,11 @@
 </template>
 
 <script>
-import NcAppSettingsDialog from '@nextcloud/vue/dist/Components/NcAppSettingsDialog.js'
-import NcAppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSection.js'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+import { NcAppSettingsDialog } from '@nextcloud/vue'
+import { NcAppSettingsSection } from '@nextcloud/vue'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import Clipboard from 'vue-material-design-icons/Clipboard.vue'
-import NcInputField from '@nextcloud/vue/dist/Components/NcInputField'
+import { NcInputField } from '@nextcloud/vue'
 import Setting from '../components/Setting.vue'
 
 import { emit } from '@nextcloud/event-bus'
diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue
index c97fb304c32d4..bf3a41d7a0c9a 100644
--- a/apps/files/src/views/Sidebar.vue
+++ b/apps/files/src/views/Sidebar.vue
@@ -89,9 +89,9 @@ import { emit } from '@nextcloud/event-bus'
 import moment from '@nextcloud/moment'
 import { Type as ShareTypes } from '@nextcloud/sharing'
 
-import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
+import { NcAppSidebar } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcEmptyContent } from '@nextcloud/vue'
 
 import FileInfo from '../services/FileInfo'
 import SidebarTab from '../components/SidebarTab'
diff --git a/apps/files/src/views/TemplatePicker.vue b/apps/files/src/views/TemplatePicker.vue
index 33b925aa2edb1..2a7506a44a505 100644
--- a/apps/files/src/views/TemplatePicker.vue
+++ b/apps/files/src/views/TemplatePicker.vue
@@ -66,8 +66,8 @@
 <script>
 import { normalize } from 'path'
 import { showError } from '@nextcloud/dialogs'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
+import { NcEmptyContent } from '@nextcloud/vue'
+import { NcModal } from '@nextcloud/vue'
 
 import { getCurrentDirectory } from '../utils/davUtils'
 import { createFromTemplate, getTemplates } from '../services/Templates'
diff --git a/apps/files_sharing/src/collaborationresources.js b/apps/files_sharing/src/collaborationresources.js
index 1e6eda02a93e5..7ae2da4962364 100644
--- a/apps/files_sharing/src/collaborationresources.js
+++ b/apps/files_sharing/src/collaborationresources.js
@@ -23,8 +23,8 @@
 
 import Vue from 'vue'
 import Vuex from 'vuex'
-import NcPopoverMenu from '@nextcloud/vue/dist/Components/NcPopoverMenu'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
+import { NcPopoverMenu } from '@nextcloud/vue'
+import { Tooltip } from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
 
 import View from './views/CollaborationView'
diff --git a/apps/files_sharing/src/components/SharePermissionsEditor.vue b/apps/files_sharing/src/components/SharePermissionsEditor.vue
index c5e652b2cda34..1ba7e05362665 100644
--- a/apps/files_sharing/src/components/SharePermissionsEditor.vue
+++ b/apps/files_sharing/src/components/SharePermissionsEditor.vue
@@ -104,9 +104,9 @@
 </template>
 
 <script>
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcActionRadio from '@nextcloud/vue/dist/Components/NcActionRadio'
-import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcActionRadio } from '@nextcloud/vue'
+import { NcActionCheckbox } from '@nextcloud/vue'
 
 import SharesMixin from '../mixins/SharesMixin'
 import {
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
index b4549112964ae..5d6f5d7729feb 100644
--- a/apps/files_sharing/src/components/SharingEntry.vue
+++ b/apps/files_sharing/src/components/SharingEntry.vue
@@ -137,12 +137,12 @@
 </template>
 
 <script>
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox'
-import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
-import NcActionTextEditable from '@nextcloud/vue/dist/Components/NcActionTextEditable'
+import { NcAvatar } from '@nextcloud/vue'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcActionCheckbox } from '@nextcloud/vue'
+import { NcActionInput } from '@nextcloud/vue'
+import { NcActionTextEditable } from '@nextcloud/vue'
 
 import SharesMixin from '../mixins/SharesMixin.js'
 
diff --git a/apps/files_sharing/src/components/SharingEntryInherited.vue b/apps/files_sharing/src/components/SharingEntryInherited.vue
index e4979fdc44d93..67cb4c779fee3 100644
--- a/apps/files_sharing/src/components/SharingEntryInherited.vue
+++ b/apps/files_sharing/src/components/SharingEntryInherited.vue
@@ -49,10 +49,10 @@
 <script>
 import { generateUrl } from '@nextcloud/router'
 import { basename } from '@nextcloud/paths'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
-import NcActionText from '@nextcloud/vue/dist/Components/NcActionText'
+import { NcAvatar } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcActionLink } from '@nextcloud/vue'
+import { NcActionText } from '@nextcloud/vue'
 
 // eslint-disable-next-line no-unused-vars
 import Share from '../models/Share'
diff --git a/apps/files_sharing/src/components/SharingEntryInternal.vue b/apps/files_sharing/src/components/SharingEntryInternal.vue
index dc76f2198798f..e7b51ad0b11fe 100644
--- a/apps/files_sharing/src/components/SharingEntryInternal.vue
+++ b/apps/files_sharing/src/components/SharingEntryInternal.vue
@@ -22,7 +22,7 @@
 <script>
 import { generateUrl } from '@nextcloud/router'
 import { showSuccess } from '@nextcloud/dialogs'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
+import { NcActionLink } from '@nextcloud/vue'
 import SharingEntrySimple from './SharingEntrySimple'
 
 export default {
diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue
index dcdebe2e8c595..3d651dc02f6c6 100644
--- a/apps/files_sharing/src/components/SharingEntryLink.vue
+++ b/apps/files_sharing/src/components/SharingEntryLink.vue
@@ -281,15 +281,15 @@ import { showError, showSuccess } from '@nextcloud/dialogs'
 import { Type as ShareTypes } from '@nextcloud/sharing'
 import Vue from 'vue'
 
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox'
-import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
-import NcActionText from '@nextcloud/vue/dist/Components/NcActionText'
-import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator'
-import NcActionTextEditable from '@nextcloud/vue/dist/Components/NcActionTextEditable'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcActionCheckbox } from '@nextcloud/vue'
+import { NcActionInput } from '@nextcloud/vue'
+import { NcActionLink } from '@nextcloud/vue'
+import { NcActionText } from '@nextcloud/vue'
+import { NcActionSeparator } from '@nextcloud/vue'
+import { NcActionTextEditable } from '@nextcloud/vue'
+import { NcActions } from '@nextcloud/vue'
+import { NcAvatar } from '@nextcloud/vue'
 
 import ExternalShareAction from './ExternalShareAction.vue'
 import SharePermissionsEditor from './SharePermissionsEditor.vue'
diff --git a/apps/files_sharing/src/components/SharingEntrySimple.vue b/apps/files_sharing/src/components/SharingEntrySimple.vue
index 43a6172fb15fc..93e0c839b82a6 100644
--- a/apps/files_sharing/src/components/SharingEntrySimple.vue
+++ b/apps/files_sharing/src/components/SharingEntrySimple.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
+import { NcActions } from '@nextcloud/vue'
 
 export default {
 	name: 'SharingEntrySimple',
diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index 46c495d8279cc..aaef47773e056 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -48,7 +48,7 @@ import { generateOcsUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 import axios from '@nextcloud/axios'
 import debounce from 'debounce'
-import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+import { NcSelect } from '@nextcloud/vue'
 
 import Config from '../services/ConfigService'
 import GeneratePassword from '../utils/GeneratePassword'
diff --git a/apps/files_sharing/src/views/SharingInherited.vue b/apps/files_sharing/src/views/SharingInherited.vue
index b570b47e25706..08b30250aad74 100644
--- a/apps/files_sharing/src/views/SharingInherited.vue
+++ b/apps/files_sharing/src/views/SharingInherited.vue
@@ -47,7 +47,7 @@
 
 <script>
 import { generateOcsUrl } from '@nextcloud/router'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import { NcActionButton } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 
 import Share from '../models/Share'
diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
index f7920346981dc..1fce0063fa330 100644
--- a/apps/files_sharing/src/views/SharingTab.vue
+++ b/apps/files_sharing/src/views/SharingTab.vue
@@ -87,7 +87,7 @@
 <script>
 import { CollectionList } from 'nextcloud-vue-collections'
 import { generateOcsUrl } from '@nextcloud/router'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
+import { NcAvatar } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import { loadState } from '@nextcloud/initial-state'
 
diff --git a/apps/files_versions/src/views/VersionTab.vue b/apps/files_versions/src/views/VersionTab.vue
index 8159415dfc79f..b1acd65a95bb1 100644
--- a/apps/files_versions/src/views/VersionTab.vue
+++ b/apps/files_versions/src/views/VersionTab.vue
@@ -69,10 +69,10 @@
 <script>
 import BackupRestore from 'vue-material-design-icons/BackupRestore.vue'
 import Download from 'vue-material-design-icons/Download.vue'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
-import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcActionLink } from '@nextcloud/vue'
+import { NcListItem } from '@nextcloud/vue'
+import { NcEmptyContent } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { fetchVersions, restoreVersion } from '../utils/versions.js'
 import moment from '@nextcloud/moment'
diff --git a/apps/oauth2/src/App.vue b/apps/oauth2/src/App.vue
index 28b1f9182e239..e47a44ba87578 100644
--- a/apps/oauth2/src/App.vue
+++ b/apps/oauth2/src/App.vue
@@ -66,8 +66,8 @@ import axios from '@nextcloud/axios'
 import OAuthItem from './components/OAuthItem'
 import { generateUrl } from '@nextcloud/router'
 import { getCapabilities } from '@nextcloud/capabilities'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcSettingsSection } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 
 export default {
diff --git a/apps/oauth2/src/components/OAuthItem.vue b/apps/oauth2/src/components/OAuthItem.vue
index 41874b1f02bb3..c9d299b2e82ee 100644
--- a/apps/oauth2/src/components/OAuthItem.vue
+++ b/apps/oauth2/src/components/OAuthItem.vue
@@ -57,7 +57,7 @@
 <script>
 
 import Delete from 'vue-material-design-icons/Delete'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcButton } from '@nextcloud/vue'
 
 export default {
 	name: 'OAuthItem',
diff --git a/apps/settings/src/components/AdminDelegating.vue b/apps/settings/src/components/AdminDelegating.vue
index 90f42f73ab581..efd5fd5e2fd3a 100644
--- a/apps/settings/src/components/AdminDelegating.vue
+++ b/apps/settings/src/components/AdminDelegating.vue
@@ -13,7 +13,7 @@
 
 <script>
 import GroupSelect from './AdminDelegation/GroupSelect'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
+import { NcSettingsSection } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 
 export default {
diff --git a/apps/settings/src/components/AdminDelegation/GroupSelect.vue b/apps/settings/src/components/AdminDelegation/GroupSelect.vue
index 52ecd6c4846f1..984a5b0cd42ca 100644
--- a/apps/settings/src/components/AdminDelegation/GroupSelect.vue
+++ b/apps/settings/src/components/AdminDelegation/GroupSelect.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 import { showError } from '@nextcloud/dialogs'
diff --git a/apps/settings/src/components/AdminTwoFactor.vue b/apps/settings/src/components/AdminTwoFactor.vue
index 950b857b07a08..e78bfc4388802 100644
--- a/apps/settings/src/components/AdminTwoFactor.vue
+++ b/apps/settings/src/components/AdminTwoFactor.vue
@@ -65,10 +65,10 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
+import { NcMultiselect } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcSettingsSection } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 
 import _ from 'lodash'
diff --git a/apps/settings/src/components/AppDetails.vue b/apps/settings/src/components/AppDetails.vue
index f4cae83f16789..c3f015bb57b6c 100644
--- a/apps/settings/src/components/AppDetails.vue
+++ b/apps/settings/src/components/AppDetails.vue
@@ -146,7 +146,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 
 import AppManagement from '../mixins/AppManagement'
 import PrefixMixin from './PrefixMixin'
diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue
index bb7c932613e6e..56343bb7bd8d3 100644
--- a/apps/settings/src/components/AppList.vue
+++ b/apps/settings/src/components/AppList.vue
@@ -107,7 +107,7 @@
 import AppItem from './AppList/AppItem'
 import PrefixMixin from './PrefixMixin'
 import pLimit from 'p-limit'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcButton } from '@nextcloud/vue'
 
 export default {
 	name: 'AppList',
diff --git a/apps/settings/src/components/AppList/AppItem.vue b/apps/settings/src/components/AppList/AppItem.vue
index cede668d51f04..c0732d8642abc 100644
--- a/apps/settings/src/components/AppList/AppItem.vue
+++ b/apps/settings/src/components/AppList/AppItem.vue
@@ -112,7 +112,7 @@
 import AppScore from './AppScore.vue'
 import AppManagement from '../../mixins/AppManagement.js'
 import SvgFilterMixin from '../SvgFilterMixin.vue'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { NcButton } from '@nextcloud/vue'
 
 export default {
 	name: 'AppItem',
diff --git a/apps/settings/src/components/AuthTokenSetupDialogue.vue b/apps/settings/src/components/AuthTokenSetupDialogue.vue
index 09b44a8b96c76..ba1f89742d024 100644
--- a/apps/settings/src/components/AuthTokenSetupDialogue.vue
+++ b/apps/settings/src/components/AuthTokenSetupDialogue.vue
@@ -86,7 +86,7 @@ import QR from '@chenfengyuan/vue-qrcode'
 import { confirmPassword } from '@nextcloud/password-confirmation'
 import '@nextcloud/password-confirmation/dist/style.css'
 import { getRootUrl } from '@nextcloud/router'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcButton } from '@nextcloud/vue'
 
 export default {
 	name: 'AuthTokenSetupDialogue',
diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue
index 17e77aff6c751..50df99404cb69 100644
--- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue
+++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue
@@ -86,9 +86,9 @@
 <script>
 import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
-import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcSettingsSection } from '@nextcloud/vue'
+import { NcNoteCard } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
diff --git a/apps/settings/src/components/BasicSettings/ProfileSettings.vue b/apps/settings/src/components/BasicSettings/ProfileSettings.vue
index 0519e60a30b6c..8fa1a294f2f62 100644
--- a/apps/settings/src/components/BasicSettings/ProfileSettings.vue
+++ b/apps/settings/src/components/BasicSettings/ProfileSettings.vue
@@ -47,7 +47,7 @@ import { saveProfileDefault } from '../../service/ProfileService'
 import { validateBoolean } from '../../utils/validate'
 import logger from '../../logger'
 
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
 
 const profileEnabledByDefault = loadState('settings', 'profileEnabledByDefault', true)
 
diff --git a/apps/settings/src/components/Encryption.vue b/apps/settings/src/components/Encryption.vue
index cec060b32d835..7e6901eb9df7f 100644
--- a/apps/settings/src/components/Encryption.vue
+++ b/apps/settings/src/components/Encryption.vue
@@ -77,9 +77,9 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
+import { NcSettingsSection } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 import { getLoggerBuilder } from '@nextcloud/logger'
 
diff --git a/apps/settings/src/components/GroupListItem.vue b/apps/settings/src/components/GroupListItem.vue
index 12bdcedcd8f90..e425c9a3de99d 100644
--- a/apps/settings/src/components/GroupListItem.vue
+++ b/apps/settings/src/components/GroupListItem.vue
@@ -53,10 +53,10 @@
 </template>
 
 <script>
-import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
+import { NcActionInput } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcCounterBubble } from '@nextcloud/vue'
+import { NcAppNavigationItem } from '@nextcloud/vue'
 
 export default {
 	name: 'GroupListItem',
diff --git a/apps/settings/src/components/PasswordSection.vue b/apps/settings/src/components/PasswordSection.vue
index b68de0365e0d2..7fe114e9364be 100644
--- a/apps/settings/src/components/PasswordSection.vue
+++ b/apps/settings/src/components/PasswordSection.vue
@@ -48,9 +48,9 @@
 </template>
 
 <script>
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcPasswordField from '@nextcloud/vue/dist/Components/NcPasswordField.js'
+import { NcSettingsSection } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
+import { NcPasswordField } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showSuccess, showError } from '@nextcloud/dialogs'
diff --git a/apps/settings/src/components/PersonalInfo/AvatarSection.vue b/apps/settings/src/components/PersonalInfo/AvatarSection.vue
index ce3c80d4820d6..f9bb6aecdb101 100644
--- a/apps/settings/src/components/PersonalInfo/AvatarSection.vue
+++ b/apps/settings/src/components/PersonalInfo/AvatarSection.vue
@@ -99,8 +99,8 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { getFilePickerBuilder, showError } from '@nextcloud/dialogs'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcAvatar } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
 import VueCropper from 'vue-cropperjs'
 // eslint-disable-next-line node/no-extraneous-import
 import 'cropperjs/dist/cropper.css'
diff --git a/apps/settings/src/components/PersonalInfo/DetailsSection.vue b/apps/settings/src/components/PersonalInfo/DetailsSection.vue
index 7d11e50d3bcab..41384686028cc 100644
--- a/apps/settings/src/components/PersonalInfo/DetailsSection.vue
+++ b/apps/settings/src/components/PersonalInfo/DetailsSection.vue
@@ -47,7 +47,7 @@
 
 <script>
 import { loadState } from '@nextcloud/initial-state'
-import NcProgressBar from '@nextcloud/vue/dist/Components/NcProgressBar'
+import { NcProgressBar } from '@nextcloud/vue'
 
 import Account from 'vue-material-design-icons/Account'
 import CircleSlice from 'vue-material-design-icons/CircleSlice3'
diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileCheckbox.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileCheckbox.vue
index 433daa0ca89b0..68f9f5c971038 100644
--- a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileCheckbox.vue
+++ b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileCheckbox.vue
@@ -38,7 +38,7 @@ import { emit } from '@nextcloud/event-bus'
 import { savePrimaryAccountProperty } from '../../../service/PersonalInfo/PersonalInfoService.js'
 import { ACCOUNT_PROPERTY_ENUM } from '../../../constants/AccountPropertyConstants.js'
 import logger from '../../../logger.js'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
 
 export default {
 	name: 'ProfileCheckbox',
diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue
index 522794a832d78..489c79525fb93 100644
--- a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue
+++ b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue
@@ -44,7 +44,7 @@
 import { getCurrentUser } from '@nextcloud/auth'
 import { generateUrl } from '@nextcloud/router'
 
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
+import { NcAvatar } from '@nextcloud/vue'
 
 export default {
 	name: 'ProfilePreviewCard',
diff --git a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue
index 24f025f2da09a..d2a86a624e2eb 100644
--- a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue
+++ b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue
@@ -41,7 +41,7 @@ import { showError } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 
 import { saveProfileParameterVisibility } from '../../../service/ProfileService.js'
 import { VISIBILITY_PROPERTY_ENUM } from '../../../constants/ProfileConstants.js'
diff --git a/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue b/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue
index ae1392fe580b4..70f56d3083f83 100644
--- a/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
+import { NcActions } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
 
diff --git a/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue b/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue
index 850a9fa42f2d9..6d990b5ef31b4 100644
--- a/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import { NcActionButton } from '@nextcloud/vue'
 
 export default {
 	name: 'FederationControlAction',
diff --git a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
index 541b46fb59163..7a3a841daafdd 100644
--- a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcButton } from '@nextcloud/vue'
 import Plus from 'vue-material-design-icons/Plus'
 
 import FederationControl from './FederationControl.vue'
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
index 9d737206bf447..90152f363af07 100644
--- a/apps/settings/src/components/UserList.vue
+++ b/apps/settings/src/components/UserList.vue
@@ -237,9 +237,9 @@
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import InfiniteLoading from 'vue-infinite-loading'
 import Vue from 'vue'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcModal } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
+import { NcMultiselect } from '@nextcloud/vue'
 
 import userRow from './UserList/UserRow'
 
diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
index eddc16a64a5cd..5703da9d847e5 100644
--- a/apps/settings/src/components/UserList/UserRowSimple.vue
+++ b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -83,9 +83,9 @@
 </template>
 
 <script>
-import NcPopoverMenu from '@nextcloud/vue/dist/Components/NcPopoverMenu'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import { NcPopoverMenu } from '@nextcloud/vue'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
 import { getCurrentUser } from '@nextcloud/auth'
 import UserRowMixin from '../../mixins/UserRowMixin'
diff --git a/apps/settings/src/components/WebAuthn/Device.vue b/apps/settings/src/components/WebAuthn/Device.vue
index d5a0623ab6882..c4030701f69bf 100644
--- a/apps/settings/src/components/WebAuthn/Device.vue
+++ b/apps/settings/src/components/WebAuthn/Device.vue
@@ -32,8 +32,8 @@
 </template>
 
 <script>
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
 
 export default {
 	name: 'Device',
diff --git a/apps/settings/src/views/Apps.vue b/apps/settings/src/views/Apps.vue
index 1ba74c08ac5f2..b1f1089da35d2 100644
--- a/apps/settings/src/views/Apps.vue
+++ b/apps/settings/src/views/Apps.vue
@@ -139,14 +139,14 @@ import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import Vue from 'vue'
 import VueLocalStorage from 'vue-localstorage'
 
-import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent'
-import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation'
-import NcAppNavigationCounter from '@nextcloud/vue/dist/Components/NcAppNavigationCounter'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
-import NcAppNavigationSpacer from '@nextcloud/vue/dist/Components/NcAppNavigationSpacer'
-import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar'
-import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab'
-import NcContent from '@nextcloud/vue/dist/Components/NcContent'
+import { NcAppContent } from '@nextcloud/vue'
+import { NcAppNavigation } from '@nextcloud/vue'
+import { NcAppNavigationCounter } from '@nextcloud/vue'
+import { NcAppNavigationItem } from '@nextcloud/vue'
+import { NcAppNavigationSpacer } from '@nextcloud/vue'
+import { NcAppSidebar } from '@nextcloud/vue'
+import { NcAppSidebarTab } from '@nextcloud/vue'
+import { NcContent } from '@nextcloud/vue'
 
 import AppList from '../components/AppList'
 import AppDetails from '../components/AppDetails'
diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue
index ce3ce235c31a2..98696b679465e 100644
--- a/apps/settings/src/views/Users.vue
+++ b/apps/settings/src/views/Users.vue
@@ -142,17 +142,17 @@
 </template>
 
 <script>
-import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent'
-import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation'
-import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigationCaption'
-import NcAppNavigationCounter from '@nextcloud/vue/dist/Components/NcAppNavigationCounter'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
-import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew'
-import NcAppNavigationSettings from '@nextcloud/vue/dist/Components/NcAppNavigationSettings'
+import { NcAppContent } from '@nextcloud/vue'
+import { NcAppNavigation } from '@nextcloud/vue'
+import { NcAppNavigationCaption } from '@nextcloud/vue'
+import { NcAppNavigationCounter } from '@nextcloud/vue'
+import { NcAppNavigationItem } from '@nextcloud/vue'
+import { NcAppNavigationNew } from '@nextcloud/vue'
+import { NcAppNavigationSettings } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
-import NcContent from '@nextcloud/vue/dist/Components/NcContent'
+import { NcContent } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import Vue from 'vue'
 import VueLocalStorage from 'vue-localstorage'
 
diff --git a/apps/sharebymail/src/components/AdminSettings.vue b/apps/sharebymail/src/components/AdminSettings.vue
index 8a6811102165c..e4320200ea0ba 100644
--- a/apps/sharebymail/src/components/AdminSettings.vue
+++ b/apps/sharebymail/src/components/AdminSettings.vue
@@ -38,8 +38,8 @@
 </template>
 
 <script>
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcSettingsSection } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
diff --git a/apps/theming/src/UserThemes.vue b/apps/theming/src/UserThemes.vue
index 0f72e95d9a8fe..bfd4669fb5f63 100644
--- a/apps/theming/src/UserThemes.vue
+++ b/apps/theming/src/UserThemes.vue
@@ -80,8 +80,8 @@
 import { generateOcsUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
 import axios from '@nextcloud/axios'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcSettingsSection } from '@nextcloud/vue'
 
 import BackgroundSettings from './components/BackgroundSettings.vue'
 import ItemPreview from './components/ItemPreview.vue'
diff --git a/apps/theming/src/components/BackgroundSettings.vue b/apps/theming/src/components/BackgroundSettings.vue
index 3629ece40d2e9..dcb2d10c565b3 100644
--- a/apps/theming/src/components/BackgroundSettings.vue
+++ b/apps/theming/src/components/BackgroundSettings.vue
@@ -93,7 +93,7 @@ import axios from '@nextcloud/axios'
 import Check from 'vue-material-design-icons/Check.vue'
 import Close from 'vue-material-design-icons/Close.vue'
 import debounce from 'debounce'
-import NcColorPicker from '@nextcloud/vue/dist/Components/NcColorPicker'
+import { NcColorPicker } from '@nextcloud/vue'
 import Vibrant from 'node-vibrant'
 import { Palette } from 'node-vibrant/lib/color'
 import { getFilePickerBuilder } from '@nextcloud/dialogs'
diff --git a/apps/theming/src/components/ItemPreview.vue b/apps/theming/src/components/ItemPreview.vue
index 015a7480c720c..da7a4d38246bb 100644
--- a/apps/theming/src/components/ItemPreview.vue
+++ b/apps/theming/src/components/ItemPreview.vue
@@ -20,7 +20,7 @@
 
 <script>
 import { generateFilePath } from '@nextcloud/router'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
 
 export default {
 	name: 'ItemPreview',
diff --git a/apps/updatenotification/src/components/UpdateNotification.vue b/apps/updatenotification/src/components/UpdateNotification.vue
index e5e05a877432f..49fcad407f07c 100644
--- a/apps/updatenotification/src/components/UpdateNotification.vue
+++ b/apps/updatenotification/src/components/UpdateNotification.vue
@@ -125,10 +125,10 @@
 
 <script>
 import { generateUrl, getRootUrl, generateOcsUrl } from '@nextcloud/router'
-import NcPopoverMenu from '@nextcloud/vue/dist/Components/NcPopoverMenu.js'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
-import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
+import { NcPopoverMenu } from '@nextcloud/vue'
+import { NcMultiselect } from '@nextcloud/vue'
+import { NcSettingsSection } from '@nextcloud/vue'
+import { NcNoteCard } from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
 import axios from '@nextcloud/axios'
 import { loadState } from '@nextcloud/initial-state'
diff --git a/apps/user_status/src/components/ClearAtSelect.vue b/apps/user_status/src/components/ClearAtSelect.vue
index 620b72a3a41ab..e89bb9b1ff8a2 100644
--- a/apps/user_status/src/components/ClearAtSelect.vue
+++ b/apps/user_status/src/components/ClearAtSelect.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import { getAllClearAtOptions } from '../services/clearAtOptionsService'
 import { clearAtFilter } from '../filters/clearAtFilter'
 
diff --git a/apps/user_status/src/components/CustomMessageInput.vue b/apps/user_status/src/components/CustomMessageInput.vue
index 4fd649dc166d8..8a7c942de1e3b 100644
--- a/apps/user_status/src/components/CustomMessageInput.vue
+++ b/apps/user_status/src/components/CustomMessageInput.vue
@@ -44,8 +44,8 @@
 </template>
 
 <script>
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
+import { NcButton } from '@nextcloud/vue'
+import { NcEmojiPicker } from '@nextcloud/vue'
 
 export default {
 	name: 'CustomMessageInput',
diff --git a/apps/user_status/src/components/SetStatusModal.vue b/apps/user_status/src/components/SetStatusModal.vue
index d7adc99da14d8..1d7ff44fe2bc6 100644
--- a/apps/user_status/src/components/SetStatusModal.vue
+++ b/apps/user_status/src/components/SetStatusModal.vue
@@ -73,8 +73,8 @@
 
 <script>
 import { showError } from '@nextcloud/dialogs'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcModal } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
 import { getAllStatusOptions } from '../services/statusOptionsService.js'
 import OnlineStatusMixin from '../mixins/OnlineStatusMixin.js'
 import PredefinedStatusesList from './PredefinedStatusesList.vue'
diff --git a/apps/user_status/src/menu.js b/apps/user_status/src/menu.js
index 66010102f10f0..3460955310320 100644
--- a/apps/user_status/src/menu.js
+++ b/apps/user_status/src/menu.js
@@ -26,7 +26,7 @@ import Vue from 'vue'
 import { getRequestToken } from '@nextcloud/auth'
 import UserStatus from './UserStatus'
 import store from './store'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
+import { NcAvatar } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 
 // eslint-disable-next-line camelcase
diff --git a/apps/user_status/src/views/Dashboard.vue b/apps/user_status/src/views/Dashboard.vue
index ef5a9832ebccd..ed0cba132aa31 100644
--- a/apps/user_status/src/views/Dashboard.vue
+++ b/apps/user_status/src/views/Dashboard.vue
@@ -45,9 +45,9 @@
 
 <script>
 import { loadState } from '@nextcloud/initial-state'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
-import NcDashboardWidget from '@nextcloud/vue/dist/Components/NcDashboardWidget'
-import NcDashboardWidgetItem from '@nextcloud/vue/dist/Components/NcDashboardWidgetItem'
+import { NcAvatar } from '@nextcloud/vue'
+import { NcDashboardWidget } from '@nextcloud/vue'
+import { NcDashboardWidgetItem } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 
 export default {
diff --git a/apps/weather_status/src/App.vue b/apps/weather_status/src/App.vue
index e287df4f91493..01c4debd43054 100644
--- a/apps/weather_status/src/App.vue
+++ b/apps/weather_status/src/App.vue
@@ -75,12 +75,12 @@
 import { showError } from '@nextcloud/dialogs'
 import moment from '@nextcloud/moment'
 import { getLocale } from '@nextcloud/l10n'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
-import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator'
-import NcActionText from '@nextcloud/vue/dist/Components/NcActionText'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcActionInput } from '@nextcloud/vue'
+import { NcActionLink } from '@nextcloud/vue'
+import { NcActionSeparator } from '@nextcloud/vue'
+import { NcActionText } from '@nextcloud/vue'
 import * as network from './services/weatherStatusService'
 
 const MODE_BROWSER_LOCATION = 1
diff --git a/apps/workflowengine/src/components/Check.vue b/apps/workflowengine/src/components/Check.vue
index 459c97a0d0529..73281a6fe3a6f 100644
--- a/apps/workflowengine/src/components/Check.vue
+++ b/apps/workflowengine/src/components/Check.vue
@@ -41,9 +41,9 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import { NcMultiselect } from '@nextcloud/vue'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
 
 export default {
diff --git a/apps/workflowengine/src/components/Checks/FileMimeType.vue b/apps/workflowengine/src/components/Checks/FileMimeType.vue
index 86f1a6b8cb198..a7dba5dc93589 100644
--- a/apps/workflowengine/src/components/Checks/FileMimeType.vue
+++ b/apps/workflowengine/src/components/Checks/FileMimeType.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import valueMixin from './../../mixins/valueMixin'
 import { imagePath } from '@nextcloud/router'
 
diff --git a/apps/workflowengine/src/components/Checks/FileSystemTag.vue b/apps/workflowengine/src/components/Checks/FileSystemTag.vue
index 1c99be3816d26..2ac9216273682 100644
--- a/apps/workflowengine/src/components/Checks/FileSystemTag.vue
+++ b/apps/workflowengine/src/components/Checks/FileSystemTag.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import MultiselectTags from '@nextcloud/vue/dist/Components/NcMultiselectTags.js'
+import { MultiselectTags } from '@nextcloud/vue'
 
 export default {
 	name: 'FileSystemTag',
diff --git a/apps/workflowengine/src/components/Checks/RequestTime.vue b/apps/workflowengine/src/components/Checks/RequestTime.vue
index d8bfaff63a59d..566db52d2d61a 100644
--- a/apps/workflowengine/src/components/Checks/RequestTime.vue
+++ b/apps/workflowengine/src/components/Checks/RequestTime.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import moment from 'moment-timezone'
 import valueMixin from '../../mixins/valueMixin'
 
diff --git a/apps/workflowengine/src/components/Checks/RequestURL.vue b/apps/workflowengine/src/components/Checks/RequestURL.vue
index 1a5b5cc7f8708..3f4b2ba65212c 100644
--- a/apps/workflowengine/src/components/Checks/RequestURL.vue
+++ b/apps/workflowengine/src/components/Checks/RequestURL.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import valueMixin from '../../mixins/valueMixin'
 
 export default {
diff --git a/apps/workflowengine/src/components/Checks/RequestUserAgent.vue b/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
index c4a5265ac991e..30895e9f9d02f 100644
--- a/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
+++ b/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import valueMixin from '../../mixins/valueMixin'
 
 export default {
diff --git a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
index ba55d88c81ce6..fa2347486e0ac 100644
--- a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
+++ b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 
diff --git a/apps/workflowengine/src/components/Event.vue b/apps/workflowengine/src/components/Event.vue
index be0030095e126..4ccfaa9e90ffc 100644
--- a/apps/workflowengine/src/components/Event.vue
+++ b/apps/workflowengine/src/components/Event.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcMultiselect } from '@nextcloud/vue'
 import { showWarning } from '@nextcloud/dialogs'
 
 export default {
diff --git a/apps/workflowengine/src/components/Operation.vue b/apps/workflowengine/src/components/Operation.vue
index 64875605b0ba6..41d58c2038aca 100644
--- a/apps/workflowengine/src/components/Operation.vue
+++ b/apps/workflowengine/src/components/Operation.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcButton } from '@nextcloud/vue'
 
 export default {
 	name: 'Operation',
diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue
index 4c5162da926a1..169bb661fe110 100644
--- a/apps/workflowengine/src/components/Rule.vue
+++ b/apps/workflowengine/src/components/Rule.vue
@@ -53,10 +53,10 @@
 </template>
 
 <script>
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { Tooltip } from '@nextcloud/vue'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
 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'
diff --git a/apps/workflowengine/src/components/Workflow.vue b/apps/workflowengine/src/components/Workflow.vue
index bc33d03014da4..af13e39114536 100644
--- a/apps/workflowengine/src/components/Workflow.vue
+++ b/apps/workflowengine/src/components/Workflow.vue
@@ -51,8 +51,8 @@
 <script>
 import Rule from './Rule'
 import Operation from './Operation'
-import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcSettingsSection } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
 import { mapGetters, mapState } from 'vuex'
 import { generateUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
diff --git a/core/src/components/AppMenu.vue b/core/src/components/AppMenu.vue
index ed3a6293c578a..206451bceef74 100644
--- a/core/src/components/AppMenu.vue
+++ b/core/src/components/AppMenu.vue
@@ -64,8 +64,8 @@
 <script>
 import { loadState } from '@nextcloud/initial-state'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionLink } from '@nextcloud/vue'
 
 export default {
 	name: 'AppMenu',
diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue
index 0b8b6c8b33e0b..884d8f36f1650 100644
--- a/core/src/components/UnifiedSearch/SearchResult.vue
+++ b/core/src/components/UnifiedSearch/SearchResult.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import NcHighlight from '@nextcloud/vue/dist/Components/NcHighlight'
+import { NcHighlight } from '@nextcloud/vue'
 
 export default {
 	name: 'SearchResult',
diff --git a/core/src/components/login/LoginButton.vue b/core/src/components/login/LoginButton.vue
index 3d3ac25de6da7..a8d54b57b17d3 100644
--- a/core/src/components/login/LoginButton.vue
+++ b/core/src/components/login/LoginButton.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcButton } from '@nextcloud/vue'
 import ArrowRight from 'vue-material-design-icons/ArrowRight.vue'
 
 export default {
diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index c7b0a9259f9df..df13cbd866f87 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -108,9 +108,9 @@
 <script>
 import { generateUrl, imagePath } from '@nextcloud/router'
 
-import NcPasswordField from '@nextcloud/vue/dist/Components/NcPasswordField.js'
-import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
-import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
+import { NcPasswordField } from '@nextcloud/vue'
+import { NcTextField } from '@nextcloud/vue'
+import { NcNoteCard } from '@nextcloud/vue'
 
 import LoginButton from './LoginButton.vue'
 
diff --git a/core/src/components/login/ResetPassword.vue b/core/src/components/login/ResetPassword.vue
index ad86281b30149..628fb974ceadb 100644
--- a/core/src/components/login/ResetPassword.vue
+++ b/core/src/components/login/ResetPassword.vue
@@ -60,8 +60,8 @@
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import LoginButton from './LoginButton.vue'
-import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
-import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
+import { NcTextField } from '@nextcloud/vue'
+import { NcNoteCard } from '@nextcloud/vue'
 
 export default {
 	name: 'ResetPassword',
diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 6b81106ff721e..a1b8506403d8e 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -80,7 +80,7 @@ import { loadState } from '@nextcloud/initial-state'
 import pLimit from 'p-limit'
 import { translate as t } from '@nextcloud/l10n'
 
-import NcButton from '@nextcloud/vue/dist/Components/NcButton'
+import { NcButton } from '@nextcloud/vue'
 
 import logger from '../../logger'
 
diff --git a/core/src/views/ContactsMenu.vue b/core/src/views/ContactsMenu.vue
index f03652bb4774d..ccb1e35da9c3c 100644
--- a/core/src/views/ContactsMenu.vue
+++ b/core/src/views/ContactsMenu.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import NcHeaderMenu from '@nextcloud/vue/dist/Components/NcHeaderMenu.js'
+import { NcHeaderMenu } from '@nextcloud/vue'
 
 import Contacts from 'vue-material-design-icons/Contacts.vue'
 
diff --git a/core/src/views/Login.vue b/core/src/views/Login.vue
index 4afa81d0dfa4d..b74c9d066c3f3 100644
--- a/core/src/views/Login.vue
+++ b/core/src/views/Login.vue
@@ -124,8 +124,8 @@ 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 NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
+import { NcButton } from '@nextcloud/vue'
+import { NcNoteCard } from '@nextcloud/vue'
 
 const query = queryString.parse(location.search)
 if (query.clear === '1') {
diff --git a/core/src/views/Profile.vue b/core/src/views/Profile.vue
index c7571fff14804..cc7bde479c3d4 100644
--- a/core/src/views/Profile.vue
+++ b/core/src/views/Profile.vue
@@ -155,9 +155,9 @@ import { loadState } from '@nextcloud/initial-state'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
+import { NcAvatar } from '@nextcloud/vue'
+import { NcActions } from '@nextcloud/vue'
+import { NcActionLink } from '@nextcloud/vue'
 import MapMarkerIcon from 'vue-material-design-icons/MapMarker'
 import PencilIcon from 'vue-material-design-icons/Pencil'
 import AccountIcon from 'vue-material-design-icons/Account'
diff --git a/core/src/views/UnifiedSearch.vue b/core/src/views/UnifiedSearch.vue
index 81e59efbd4c32..c666b97f1f1ee 100644
--- a/core/src/views/UnifiedSearch.vue
+++ b/core/src/views/UnifiedSearch.vue
@@ -158,11 +158,11 @@ import debounce from 'debounce'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { showError } from '@nextcloud/dialogs'
 
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
-import NcHeaderMenu from '@nextcloud/vue/dist/Components/NcHeaderMenu.js'
-import NcHighlight from '@nextcloud/vue/dist/Components/NcHighlight.js'
+import { NcActionButton } from '@nextcloud/vue'
+import { NcActions } from '@nextcloud/vue'
+import { NcEmptyContent } from '@nextcloud/vue'
+import { NcHeaderMenu } from '@nextcloud/vue'
+import { NcHighlight } from '@nextcloud/vue'
 
 import Magnify from 'vue-material-design-icons/Magnify.vue'
 
diff --git a/core/src/views/UnsupportedBrowser.vue b/core/src/views/UnsupportedBrowser.vue
index e46c64da24c5b..4d5ba1bbae60b 100644
--- a/core/src/views/UnsupportedBrowser.vue
+++ b/core/src/views/UnsupportedBrowser.vue
@@ -50,8 +50,8 @@
 <script>
 import { generateUrl } from '@nextcloud/router'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
+import { NcButton } from '@nextcloud/vue'
+import { NcEmptyContent } from '@nextcloud/vue'
 import Web from 'vue-material-design-icons/Web'
 
 import { browserStorageKey } from '../utils/RedirectUnsupportedBrowsers.js'