Merge pull request #3065 from nextcloud/backport/2979/stable25v25.0.0rc2

[stable25] Adjust package import

14 files changed, 15 insertions, 21 deletions

diff --git a/src/components/Editor/AvatarWrapper.vue b/src/components/Editor/AvatarWrapper.vue
index ab2ae46f6..15119ae5f 100644
--- a/src/components/Editor/AvatarWrapper.vue
+++ b/src/components/Editor/AvatarWrapper.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
+import { NcAvatar } from '@nextcloud/vue'
 export default {
 	name: 'AvatarWrapper',
 	components: {
diff --git a/src/components/Editor/EditorOutline.vue b/src/components/Editor/EditorOutline.vue
index 158c9db3a..6a1016e82 100644
--- a/src/components/Editor/EditorOutline.vue
+++ b/src/components/Editor/EditorOutline.vue
@@ -14,7 +14,7 @@
 
 <script>
 import debounce from 'debounce'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { NcButton } from '@nextcloud/vue'
 import TableOfContents from './TableOfContents.vue'
 import { useOutlineStateMixin, useOutlineActions } from './Wrapper.provider.js'
 import { Close } from './../icons.js'
diff --git a/src/components/Editor/GuestNameDialog.vue b/src/components/Editor/GuestNameDialog.vue
index 7f1890b6d..f12797878 100644
--- a/src/components/Editor/GuestNameDialog.vue
+++ b/src/components/Editor/GuestNameDialog.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { Tooltip } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 import AvatarWrapper from './AvatarWrapper.vue'
 import { useSyncServiceMixin } from '../Editor.provider.js'
diff --git a/src/components/Editor/SessionList.vue b/src/components/Editor/SessionList.vue
index d0a62c1ec..b4ea09de7 100644
--- a/src/components/Editor/SessionList.vue
+++ b/src/components/Editor/SessionList.vue
@@ -62,8 +62,7 @@
 </template>
 
 <script>
-import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { NcPopover, Tooltip } from '@nextcloud/vue'
 import AvatarWrapper from './AvatarWrapper.vue'
 import store from '../../mixins/store.js'
 
diff --git a/src/components/Editor/Status.vue b/src/components/Editor/Status.vue
index 5acb93168..97dc1727b 100644
--- a/src/components/Editor/Status.vue
+++ b/src/components/Editor/Status.vue
@@ -42,7 +42,7 @@
 <script>
 
 import { ERROR_TYPE } from './../../services/SyncService.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { Tooltip } from '@nextcloud/vue'
 import {
 	useIsMobileMixin,
 	useIsPublicMixin,
diff --git a/src/components/EmojiList.vue b/src/components/EmojiList.vue
index 7c162d832..343a1647e 100644
--- a/src/components/EmojiList.vue
+++ b/src/components/EmojiList.vue
@@ -42,7 +42,7 @@
 
 <script>
 import { translate as t } from '@nextcloud/l10n'
-import { addRecent } from '@nextcloud/vue/dist/Functions/emoji.js'
+import { emojiAddRecent } from '@nextcloud/vue'
 
 export default {
 	name: 'EmojiList',
@@ -118,7 +118,7 @@ export default {
 
 			if (emojiObject) {
 				this.command(emojiObject)
-				addRecent(emojiObject)
+				emojiAddRecent(emojiObject)
 			}
 		},
 	},
diff --git a/src/components/HelpModal.vue b/src/components/HelpModal.vue
index 15c0141f6..416bc01b9 100644
--- a/src/components/HelpModal.vue
+++ b/src/components/HelpModal.vue
@@ -159,8 +159,7 @@
 </template>
 
 <script>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { NcModal, Tooltip } from '@nextcloud/vue'
 import isMobile from './../mixins/isMobile.js'
 
 export default {
diff --git a/src/components/Menu/ActionAttachmentUpload.vue b/src/components/Menu/ActionAttachmentUpload.vue
index a6f1918de..4e2fed543 100644
--- a/src/components/Menu/ActionAttachmentUpload.vue
+++ b/src/components/Menu/ActionAttachmentUpload.vue
@@ -55,9 +55,7 @@
 </template>
 
 <script>
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-
+import { NcActions, NcActionButton } from '@nextcloud/vue'
 import { Loading, Folder, Upload } from '../icons.js'
 import { useIsPublicMixin } from '../Editor.provider.js'
 import { BaseActionEntry } from './BaseActionEntry.js'
diff --git a/src/components/Menu/ActionList.vue b/src/components/Menu/ActionList.vue
index 6df3e23f6..662bd2fbf 100644
--- a/src/components/Menu/ActionList.vue
+++ b/src/components/Menu/ActionList.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+import { NcActions } from '@nextcloud/vue'
 import { BaseActionEntry } from './BaseActionEntry.js'
 import ActionSingle from './ActionSingle.vue'
 import { getIsActive } from './utils.js'
diff --git a/src/components/Menu/ActionSingle.vue b/src/components/Menu/ActionSingle.vue
index dc3c21ee9..9278672c7 100644
--- a/src/components/Menu/ActionSingle.vue
+++ b/src/components/Menu/ActionSingle.vue
@@ -21,8 +21,7 @@
   -->
 
 <script>
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcButton, NcActionButton } from '@nextcloud/vue'
 import { BaseActionEntry } from './BaseActionEntry.js'
 
 export default {
diff --git a/src/components/Menu/BaseActionEntry.js b/src/components/Menu/BaseActionEntry.js
index 60b1b778e..9e8a7a723 100644
--- a/src/components/Menu/BaseActionEntry.js
+++ b/src/components/Menu/BaseActionEntry.js
@@ -22,7 +22,7 @@
 
 /* eslint-disable jsdoc/valid-types */
 
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { Tooltip } from '@nextcloud/vue'
 import debounce from 'debounce'
 
 import { useEditorMixin, useIsMobileMixin } from '../Editor.provider.js'
diff --git a/src/components/Menu/EmojiPickerAction.vue b/src/components/Menu/EmojiPickerAction.vue
index f2ce30fcb..d39e16e7d 100644
--- a/src/components/Menu/EmojiPickerAction.vue
+++ b/src/components/Menu/EmojiPickerAction.vue
@@ -38,8 +38,7 @@
 
 <script>
 import { BaseActionEntry } from './BaseActionEntry.js'
-import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { NcEmojiPicker, NcButton } from '@nextcloud/vue'
 
 export default {
 	name: 'EmojiPickerAction',
diff --git a/src/components/MenuBubble.vue b/src/components/MenuBubble.vue
index 7a9e31578..168fbd6d0 100644
--- a/src/components/MenuBubble.vue
+++ b/src/components/MenuBubble.vue
@@ -79,7 +79,7 @@ import { BubbleMenu } from '@tiptap/vue-2'
 import { getMarkAttributes } from '@tiptap/core'
 import { getCurrentUser } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { Tooltip } from '@nextcloud/vue'
 import { optimalPath } from './../helpers/files.js'
 
 import { useEditorMixin } from './Editor.provider.js'
diff --git a/src/components/PublicFilesEditor.vue b/src/components/PublicFilesEditor.vue
index ddf29b220..d311a5989 100644
--- a/src/components/PublicFilesEditor.vue
+++ b/src/components/PublicFilesEditor.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+import { NcModal } from '@nextcloud/vue'
 
 export default {
 	name: 'PublicFilesEditor',