perf(bundles): Improve import to only load components once

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Jan 26, 2023 · 73ca6a2 · 73ca6a2
1 parent 919a840
commit 73ca6a2
Show file tree

Hide file tree

Showing 86 changed files with 198 additions and 198 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',