♻️ use single entry from @nextcloud/vue

Vinicius Reis · Vinicius Reis · commit 7419e87d01bd · 2022-09-27T05:49:42.000-03:00
Signed-off-by: Vinicius Reis &lt;vinicius.reis@nextcloud.com&gt;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,10 +80,15 @@
     "@tiptap/extension-underline": "^2.0.0-beta.196",
     "@tiptap/suggestion": "^2.0.0-beta.196",
     "@tiptap/vue-2": "^2.0.0-beta.196",
+    "debounce": "^1.2.1",
+    "escape-html": "^1.0.3",
+    "highlight.js": "^10.7.3",
+    "lowlight": "^1.20.0",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",
     "markdown-it-front-matter": "^0.2.3",
     "path-normalize": "^6.0.7",
+    "mitt": "^3.0.0",
     "prosemirror-collab": "^1.3.0",
     "prosemirror-inputrules": "^1.2.0",
     "prosemirror-markdown": "^1.9.4",
@@ -119,15 +124,10 @@
     "@vue/vue2-jest": "^28.1.0",
     "cypress": "^10.8.0",
     "cypress-file-upload": "^5.0.8",
-    "debounce": "^1.2.1",
-    "escape-html": "^1.0.3",
     "eslint-plugin-cypress": "^2.12.1",
-    "highlight.js": "^10.7.3",
     "jest": "^28.1.3",
     "jest-environment-jsdom": "^29.0.3",
     "jest-serializer-vue": "^2.0.2",
-    "lowlight": "^1.20.0",
-    "mitt": "^3.0.0",
     "vite": "^3.1.3",
     "vite-plugin-commonjs": "^0.5.2",
     "vue-demi": "^0.13.11",
diff --git a/src/EditorFactory.js b/src/EditorFactory.js
@@ -36,7 +36,7 @@ import 'proxy-polyfill'
 import { Editor } from '@tiptap/core'
 import { VueRenderer } from '@tiptap/vue-2'
 import { translate as t } from '@nextcloud/l10n'
-import { emojiSearch } from '@nextcloud/vue/dist/Functions/emoji.js'
+import { emojiSearch } from '@nextcloud/vue'
 import { listLanguages, registerLanguage } from 'lowlight/lib/core.js'
 
 import { logger } from './helpers/logger.js'
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+import { NcModal } from '@nextcloud/vue'
 
 export default {
 	name: 'PublicFilesEditor',
diff --git a/src/extensions/Mention.vue b/src/extensions/Mention.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
+import { NcUserBubble } from '@nextcloud/vue'
 import { NodeViewWrapper } from '@tiptap/vue-2'
 import { getCurrentUser } from '@nextcloud/auth'
 
diff --git a/src/nodes/ImageView.vue b/src/nodes/ImageView.vue
@@ -120,7 +120,7 @@
 <script>
 import axios from '@nextcloud/axios'
 import ClickOutside from 'vue-click-outside'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { NcButton } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 import { NodeViewWrapper } from '@tiptap/vue-2'
 
diff --git a/src/nodes/Table/TableCellView.vue b/src/nodes/Table/TableCellView.vue
@@ -57,8 +57,7 @@
 
 <script>
 import { NodeViewWrapper, NodeViewContent } from '@tiptap/vue-2'
-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 { TableAddRowBefore, TableAddRowAfter, Delete } from '../../components/icons.js'
 
 export default {
diff --git a/src/nodes/Table/TableHeaderView.vue b/src/nodes/Table/TableHeaderView.vue
@@ -57,8 +57,7 @@
 
 <script>
 import { NodeViewWrapper, NodeViewContent } from '@tiptap/vue-2'
-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 { Delete, TableAddColumnBefore, TableAddColumnAfter } from '../../components/icons.js'
 
 export default {
diff --git a/src/nodes/Table/TableView.vue b/src/nodes/Table/TableView.vue
@@ -45,8 +45,7 @@
 
 <script>
 import { NodeViewWrapper, NodeViewContent } from '@tiptap/vue-2'
-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 { TableSettings, Delete } from '../../components/icons.js'
 
 export default {
