fix: circular import issues

Fixes all circular import issues since they could mess with rollup's ability to properly chunk js files.

packages/web-app-files/src/views/spaces/DriveResolver.vue

@@ -37,7 +37,7 @@ import { locationPublicUpload } from '@ownclouders/web-pkg'
 import { createFileRouteOptions } from '@ownclouders/web-pkg'
 import { AppLoadingSpinner } from '@ownclouders/web-pkg'
 import { dirname } from 'path'
-import AppBanner from '@ownclouders/web-pkg/src/components/AppBanner.vue'
+import { AppBanner } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   components: {

packages/web-app-preview/src/App.vue

@@ -114,7 +114,7 @@ import MediaAudio from './components/Sources/MediaAudio.vue'
 import MediaImage from './components/Sources/MediaImage.vue'
 import MediaVideo from './components/Sources/MediaVideo.vue'
 import { CachedFile } from './helpers/types'
-import AppBanner from '@ownclouders/web-pkg/src/components/AppBanner.vue'
+import { AppBanner } from '@ownclouders/web-pkg'
 import { watch } from 'vue'
 import { getCurrentInstance } from 'vue'
 import { getMimeTypes } from './mimeTypes'

packages/web-pkg/src/components/AppTemplates/AppWrapper.vue

@@ -40,7 +40,7 @@ import { onBeforeRouteLeave, useRouter } from 'vue-router'
 import AppTopBar from '../AppTopBar.vue'
 import ErrorScreen from './PartialViews/ErrorScreen.vue'
 import LoadingScreen from './PartialViews/LoadingScreen.vue'
-import { FileSideBar } from '../SideBar'
+import FileSideBar from '../SideBar/FileSideBar.vue'
 import {
   UrlForResourceOptions,
   queryItemAsString,

packages/web-pkg/src/components/FilesList/ResourceTiles.vue

@@ -143,7 +143,8 @@ import {
 } from '../../helpers'
 import { eventBus } from '../../services'
 import { ImageDimension } from '../../constants'
-import { ResourceTile, ResourceGhostElement } from './index'
+import ResourceTile from './ResourceTile.vue'
+import ResourceGhostElement from './ResourceGhostElement.vue'
 import {
   FolderViewModeConstants,
   SortDir,

packages/web-pkg/src/components/SideBar/FileSideBar.vue

@@ -28,9 +28,10 @@
 <script lang="ts">
 import { computed, defineComponent, PropType, provide, readonly, ref, unref, watch } from 'vue'
 import PQueue from 'p-queue'
-import { SideBarPanelContext, SideBar as InnerSideBar } from '../SideBar'
-import { SpaceInfo } from './Spaces'
-import { FileInfo } from './Files'
+import { SideBarPanelContext } from '../SideBar/types'
+import InnerSideBar from '../SideBar/SideBar.vue'
+import SpaceInfo from './Spaces/SpaceInfo.vue'
+import FileInfo from './Files/FileInfo.vue'
 import {
   isLocationCommonActive,
   isLocationSharesActive,

packages/web-pkg/src/components/index.ts

@@ -10,6 +10,7 @@ export * from './SideBar'
 export * from './Search'
 export * from './Spaces'
 
+export { default as AppBanner } from './AppBanner.vue'
 export { default as AppLoadingSpinner } from './AppLoadingSpinner.vue'
 export { default as AppTopBar } from './AppTopBar.vue'
 export { default as BatchActions } from './BatchActions.vue'

packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts

@@ -1,7 +1,7 @@
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
-import { CreateLinkModal } from '../../../components'
+import CreateLinkModal from '../../../components/CreateLinkModal.vue'
 import { useAbility } from '../../ability'
 import { LinkShare, isProjectSpaceResource } from '@ownclouders/web-client'
 import { useLinkTypes } from '../../links'

packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts

@@ -2,7 +2,7 @@ import { SpaceResource, isShareSpaceResource } from '@ownclouders/web-client'
 import { computed, nextTick, Ref, unref } from 'vue'
 import { useClientService } from '../../clientService'
 import { useRouter } from '../../router'
-import { FileAction } from '../../../'
+import { FileAction } from '../types'
 import { useGettext } from 'vue3-gettext'
 import { resolveFileNameDuplicate } from '../../../helpers/resource'
 import { join } from 'path'

packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewShortcut.ts

@@ -1,6 +1,6 @@
 import { computed, Ref, unref } from 'vue'
 import { FileAction, useModals, useResourcesStore } from '../../../composables'
-import { CreateShortcutModal } from '../../../components'
+import CreateShortcutModal from '../../../components/CreateShortcutModal.vue'
 import { useGettext } from 'vue3-gettext'
 import { storeToRefs } from 'pinia'
 import { SpaceResource } from '@ownclouders/web-client'

packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditQuota.ts

@@ -3,7 +3,7 @@ import { SpaceAction, SpaceActionOptions } from '../types'
 import { useGettext } from 'vue3-gettext'
 import { useAbility } from '../../ability'
 import { SpaceResource, isProjectSpaceResource, isSpaceResource } from '@ownclouders/web-client'
-import { QuotaModal } from '../../../components'
+import QuotaModal from '../../../components/Spaces/QuotaModal.vue'
 import { useModals } from '../../piniaStores'
 
 export const useSpaceActionsEditQuota = () => {

packages/web-pkg/src/helpers/resource/conflictHandling/conflictDialog.ts

@@ -1,8 +1,9 @@
 import { join } from 'path'
 import { Resource } from '@ownclouders/web-client'
-import { ResolveConflict, ResolveStrategy } from '.'
+import { ResolveConflict, ResolveStrategy } from './types'
 import { useModals } from '../../../composables'
-import { SpaceMoveInfoModal, ResourceConflictModal } from '../../../components'
+import SpaceMoveInfoModal from '../../../components/Modals/SpaceMoveInfoModal.vue'
+import ResourceConflictModal from '../../../components/Modals/ResourceConflictModal.vue'
 
 export interface FileConflict {
   resource: Resource

packages/web-runtime/src/container/bootstrap.ts

@@ -51,10 +51,7 @@ import { getQueryParam } from '../helpers/url'
 import PQueue from 'p-queue'
 import { storeToRefs } from 'pinia'
 import { getExtensionNavItems } from '../helpers/navItems'
-import {
-  RawConfigSchema,
-  SentryConfig
-} from '@ownclouders/web-pkg/src/composables/piniaStores/config/types'
+import { RawConfigSchema, SentryConfig } from '@ownclouders/web-pkg'
 import {
   onSSEFileLockingEvent,
   onSSEItemRenamedEvent,

packages/web-runtime/src/services/auth/userManager.ts

@@ -6,7 +6,7 @@ import {
   User,
   ErrorResponse
 } from 'oidc-client-ts'
-import { buildUrl } from '@ownclouders/web-pkg/src/helpers/router/buildUrl'
+import { buildUrl } from '@ownclouders/web-pkg'
 import { getAbilities } from './abilities'
 import { AuthStore, UserStore, CapabilityStore, ConfigStore } from '@ownclouders/web-pkg'
 import { ClientService } from '@ownclouders/web-pkg'