From 7e37668940d06c5aa20b60d9bfd600d50a171014 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Sun, 4 Aug 2024 21:41:55 +0200 Subject: [PATCH] fix(module): suffix types imports with `/index` Resolves #2018 --- src/runtime/components/data/Table.vue | 2 +- src/runtime/components/elements/Accordion.vue | 4 ++-- src/runtime/components/elements/Alert.vue | 2 +- src/runtime/components/elements/Avatar.vue | 2 +- src/runtime/components/elements/AvatarGroup.ts | 2 +- src/runtime/components/elements/Badge.vue | 2 +- src/runtime/components/elements/Button.vue | 2 +- src/runtime/components/elements/ButtonGroup.ts | 2 +- src/runtime/components/elements/Carousel.vue | 2 +- src/runtime/components/elements/Chip.vue | 2 +- src/runtime/components/elements/Dropdown.vue | 2 +- src/runtime/components/elements/Kbd.vue | 2 +- src/runtime/components/elements/Meter.vue | 2 +- src/runtime/components/elements/MeterGroup.ts | 2 +- src/runtime/components/elements/Progress.vue | 2 +- src/runtime/components/forms/Checkbox.vue | 2 +- src/runtime/components/forms/FormGroup.vue | 2 +- src/runtime/components/forms/Input.vue | 2 +- src/runtime/components/forms/InputMenu.vue | 2 +- src/runtime/components/forms/Radio.vue | 2 +- src/runtime/components/forms/RadioGroup.vue | 2 +- src/runtime/components/forms/Range.vue | 2 +- src/runtime/components/forms/Select.vue | 2 +- src/runtime/components/forms/SelectMenu.vue | 2 +- src/runtime/components/forms/Textarea.vue | 2 +- src/runtime/components/forms/Toggle.vue | 2 +- src/runtime/components/layout/Card.vue | 2 +- src/runtime/components/layout/Container.vue | 2 +- src/runtime/components/layout/Divider.vue | 2 +- src/runtime/components/layout/Skeleton.vue | 2 +- src/runtime/components/navigation/Breadcrumb.vue | 2 +- src/runtime/components/navigation/CommandPalette.vue | 2 +- src/runtime/components/navigation/CommandPaletteGroup.vue | 2 +- src/runtime/components/navigation/HorizontalNavigation.vue | 2 +- src/runtime/components/navigation/Pagination.vue | 2 +- src/runtime/components/navigation/Tabs.vue | 2 +- src/runtime/components/navigation/VerticalNavigation.vue | 2 +- src/runtime/components/overlays/ContextMenu.vue | 2 +- src/runtime/components/overlays/Modal.vue | 2 +- src/runtime/components/overlays/Notification.vue | 2 +- src/runtime/components/overlays/Notifications.vue | 2 +- src/runtime/components/overlays/Popover.vue | 2 +- src/runtime/components/overlays/Slideover.vue | 4 ++-- src/runtime/components/overlays/Tooltip.vue | 2 +- src/runtime/composables/useUI.ts | 2 +- src/runtime/utils/index.ts | 2 +- 46 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/runtime/components/data/Table.vue b/src/runtime/components/data/Table.vue index a46729eb..c36b679f 100644 --- a/src/runtime/components/data/Table.vue +++ b/src/runtime/components/data/Table.vue @@ -121,7 +121,7 @@ import UProgress from '../elements/Progress.vue' import UCheckbox from '../forms/Checkbox.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, get } from '../../utils' -import type { Strategy, Button, ProgressColor, ProgressAnimation } from '../../types' +import type { Strategy, Button, ProgressColor, ProgressAnimation } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { table } from '#ui/ui.config' diff --git a/src/runtime/components/elements/Accordion.vue b/src/runtime/components/elements/Accordion.vue index a378b422..df2a951b 100644 --- a/src/runtime/components/elements/Accordion.vue +++ b/src/runtime/components/elements/Accordion.vue @@ -73,7 +73,7 @@ import UIcon from '../elements/Icon.vue' import UButton from '../elements/Button.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, omit } from '../../utils' -import type { AccordionItem, Strategy } from '../../types' +import type { AccordionItem, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { accordion, button } from '#ui/ui.config' @@ -194,7 +194,7 @@ export default defineComponent({ attrs, buttonRefs, closeOthers, - omit, + omit: (omit as any), onEnter, onBeforeLeave, onAfterEnter, diff --git a/src/runtime/components/elements/Alert.vue b/src/runtime/components/elements/Alert.vue index c1b6e850..5f57d55e 100644 --- a/src/runtime/components/elements/Alert.vue +++ b/src/runtime/components/elements/Alert.vue @@ -47,7 +47,7 @@ import UIcon from '../elements/Icon.vue' import UAvatar from '../elements/Avatar.vue' import UButton from '../elements/Button.vue' import { useUI } from '../../composables/useUI' -import type { Avatar, Button, AlertColor, AlertVariant, AlertAction, Strategy } from '../../types' +import type { Avatar, Button, AlertColor, AlertVariant, AlertAction, Strategy } from '../../types/index' import { mergeConfig } from '../../utils' // @ts-expect-error import appConfig from '#build/app.config' diff --git a/src/runtime/components/elements/Avatar.vue b/src/runtime/components/elements/Avatar.vue index b6416e25..73fcaf10 100644 --- a/src/runtime/components/elements/Avatar.vue +++ b/src/runtime/components/elements/Avatar.vue @@ -27,7 +27,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import UIcon from '../elements/Icon.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { AvatarSize, AvatarChipColor, AvatarChipPosition, Strategy } from '../../types' +import type { AvatarSize, AvatarChipColor, AvatarChipPosition, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { avatar } from '#ui/ui.config' diff --git a/src/runtime/components/elements/AvatarGroup.ts b/src/runtime/components/elements/AvatarGroup.ts index dc87e34f..bdab268c 100644 --- a/src/runtime/components/elements/AvatarGroup.ts +++ b/src/runtime/components/elements/AvatarGroup.ts @@ -4,7 +4,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import UAvatar from './Avatar.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, getSlotsChildren } from '../../utils' -import type { AvatarSize, Strategy } from '../../types' +import type { AvatarSize, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { avatar, avatarGroup } from '#ui/ui.config' diff --git a/src/runtime/components/elements/Badge.vue b/src/runtime/components/elements/Badge.vue index 43bad879..2f82a18e 100644 --- a/src/runtime/components/elements/Badge.vue +++ b/src/runtime/components/elements/Badge.vue @@ -11,7 +11,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { BadgeColor, BadgeSize, BadgeVariant, Strategy } from '../../types' +import type { BadgeColor, BadgeSize, BadgeVariant, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { badge } from '#ui/ui.config' diff --git a/src/runtime/components/elements/Button.vue b/src/runtime/components/elements/Button.vue index cdcdf2dd..8bcf767f 100644 --- a/src/runtime/components/elements/Button.vue +++ b/src/runtime/components/elements/Button.vue @@ -25,7 +25,7 @@ import ULink from '../elements/Link.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, nuxtLinkProps, getNuxtLinkProps } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { ButtonColor, ButtonSize, ButtonVariant, Strategy } from '../../types' +import type { ButtonColor, ButtonSize, ButtonVariant, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { button } from '#ui/ui.config' diff --git a/src/runtime/components/elements/ButtonGroup.ts b/src/runtime/components/elements/ButtonGroup.ts index 0d91d134..ccd72600 100644 --- a/src/runtime/components/elements/ButtonGroup.ts +++ b/src/runtime/components/elements/ButtonGroup.ts @@ -4,7 +4,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig, getSlotsChildren } from '../../utils' import { useProvideButtonGroup } from '../../composables/useButtonGroup' -import type { ButtonSize, Strategy } from '../../types' +import type { ButtonSize, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { button, buttonGroup } from '#ui/ui.config' diff --git a/src/runtime/components/elements/Carousel.vue b/src/runtime/components/elements/Carousel.vue index 6f3fa82f..3593b8ff 100644 --- a/src/runtime/components/elements/Carousel.vue +++ b/src/runtime/components/elements/Carousel.vue @@ -61,7 +61,7 @@ import type { PropType } from 'vue' import { twMerge } from 'tailwind-merge' import { mergeConfig } from '../../utils' import UButton from '../elements/Button.vue' -import type { Strategy, Button } from '../../types' +import type { Strategy, Button } from '../../types/index' import { useUI } from '../../composables/useUI' import { useCarouselScroll } from '../../composables/useCarouselScroll' import { useScroll, useResizeObserver, useElementSize } from '@vueuse/core' diff --git a/src/runtime/components/elements/Chip.vue b/src/runtime/components/elements/Chip.vue index a52d0a28..6a529e22 100644 --- a/src/runtime/components/elements/Chip.vue +++ b/src/runtime/components/elements/Chip.vue @@ -16,7 +16,7 @@ import type { PropType } from 'vue' import { twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { ChipSize, ChipColor, ChipPosition, Strategy } from '../../types' +import type { ChipSize, ChipColor, ChipPosition, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { chip } from '#ui/ui.config' diff --git a/src/runtime/components/elements/Dropdown.vue b/src/runtime/components/elements/Dropdown.vue index 42742c10..64b4c45c 100644 --- a/src/runtime/components/elements/Dropdown.vue +++ b/src/runtime/components/elements/Dropdown.vue @@ -67,7 +67,7 @@ import UKbd from '../elements/Kbd.vue' import { useUI } from '../../composables/useUI' import { usePopper } from '../../composables/usePopper' import { mergeConfig, getNuxtLinkProps } from '../../utils' -import type { DropdownItem, PopperOptions, Strategy } from '../../types' +import type { DropdownItem, PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { dropdown } from '#ui/ui.config' diff --git a/src/runtime/components/elements/Kbd.vue b/src/runtime/components/elements/Kbd.vue index 297bf7cd..657c8365 100644 --- a/src/runtime/components/elements/Kbd.vue +++ b/src/runtime/components/elements/Kbd.vue @@ -10,7 +10,7 @@ import type { PropType } from 'vue' import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { KbdSize, Strategy } from '../../types' +import type { KbdSize, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { kbd } from '#ui/ui.config' diff --git a/src/runtime/components/elements/Meter.vue b/src/runtime/components/elements/Meter.vue index ab6d3c43..f116dee3 100644 --- a/src/runtime/components/elements/Meter.vue +++ b/src/runtime/components/elements/Meter.vue @@ -34,7 +34,7 @@ import { twJoin } from 'tailwind-merge' import UIcon from '../elements/Icon.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy, MeterColor, MeterSize } from '../../types' +import type { Strategy, MeterColor, MeterSize } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { meter } from '#ui/ui.config' diff --git a/src/runtime/components/elements/MeterGroup.ts b/src/runtime/components/elements/MeterGroup.ts index 206575c6..98a6a3b7 100644 --- a/src/runtime/components/elements/MeterGroup.ts +++ b/src/runtime/components/elements/MeterGroup.ts @@ -5,7 +5,7 @@ import UIcon from '../elements/Icon.vue' import Meter from './Meter.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, getSlotsChildren } from '../../utils' -import type { Strategy, MeterSize } from '../../types' +import type { Strategy, MeterSize } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { meter, meterGroup } from '#ui/ui.config' diff --git a/src/runtime/components/elements/Progress.vue b/src/runtime/components/elements/Progress.vue index 6ae77b26..5ffdbb55 100644 --- a/src/runtime/components/elements/Progress.vue +++ b/src/runtime/components/elements/Progress.vue @@ -33,7 +33,7 @@ import type { PropType } from 'vue' import { twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy, ProgressSize, ProgressAnimation, ProgressColor } from '../../types' +import type { Strategy, ProgressSize, ProgressAnimation, ProgressColor } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { progress } from '#ui/ui.config' diff --git a/src/runtime/components/forms/Checkbox.vue b/src/runtime/components/forms/Checkbox.vue index 7c98b940..24f5bbe2 100644 --- a/src/runtime/components/forms/Checkbox.vue +++ b/src/runtime/components/forms/Checkbox.vue @@ -36,7 +36,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types' +import type { Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { checkbox } from '#ui/ui.config' diff --git a/src/runtime/components/forms/FormGroup.vue b/src/runtime/components/forms/FormGroup.vue index 9972d458..a08d0b7e 100644 --- a/src/runtime/components/forms/FormGroup.vue +++ b/src/runtime/components/forms/FormGroup.vue @@ -44,7 +44,7 @@ import { computed, defineComponent, provide, inject, ref, toRef } from 'vue' import type { Ref, PropType } from 'vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { FormError, InjectedFormGroupValue, FormGroupSize, Strategy } from '../../types' +import type { FormError, InjectedFormGroupValue, FormGroupSize, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { formGroup } from '#ui/ui.config' diff --git a/src/runtime/components/forms/Input.vue b/src/runtime/components/forms/Input.vue index f13abd1d..1cb59530 100644 --- a/src/runtime/components/forms/Input.vue +++ b/src/runtime/components/forms/Input.vue @@ -41,7 +41,7 @@ import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig, looseToNumber } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { InputSize, InputColor, InputVariant, Strategy } from '../../types' +import type { InputSize, InputColor, InputVariant, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { input } from '#ui/ui.config' diff --git a/src/runtime/components/forms/InputMenu.vue b/src/runtime/components/forms/InputMenu.vue index 773706a9..db0a981e 100644 --- a/src/runtime/components/forms/InputMenu.vue +++ b/src/runtime/components/forms/InputMenu.vue @@ -111,7 +111,7 @@ import { usePopper } from '../../composables/usePopper' import { useFormGroup } from '../../composables/useFormGroup' import { get, mergeConfig } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { InputSize, InputColor, InputVariant, PopperOptions, Strategy } from '../../types' +import type { InputSize, InputColor, InputVariant, PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { input, inputMenu } from '#ui/ui.config' diff --git a/src/runtime/components/forms/Radio.vue b/src/runtime/components/forms/Radio.vue index a2bb8405..ac629ce9 100644 --- a/src/runtime/components/forms/Radio.vue +++ b/src/runtime/components/forms/Radio.vue @@ -35,7 +35,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types' +import type { Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { radio } from '#ui/ui.config' diff --git a/src/runtime/components/forms/RadioGroup.vue b/src/runtime/components/forms/RadioGroup.vue index c44bb383..1d334b49 100644 --- a/src/runtime/components/forms/RadioGroup.vue +++ b/src/runtime/components/forms/RadioGroup.vue @@ -36,7 +36,7 @@ import type { PropType } from 'vue' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig, get } from '../../utils' -import type { Strategy } from '../../types' +import type { Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { radioGroup, radio } from '#ui/ui.config' diff --git a/src/runtime/components/forms/Range.vue b/src/runtime/components/forms/Range.vue index 4c26ba30..2667a4bb 100644 --- a/src/runtime/components/forms/Range.vue +++ b/src/runtime/components/forms/Range.vue @@ -26,7 +26,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig } from '../../utils' -import type { RangeSize, RangeColor, Strategy } from '../../types' +import type { RangeSize, RangeColor, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { range } from '#ui/ui.config' diff --git a/src/runtime/components/forms/Select.vue b/src/runtime/components/forms/Select.vue index 14d8061a..32ccf3d0 100644 --- a/src/runtime/components/forms/Select.vue +++ b/src/runtime/components/forms/Select.vue @@ -61,7 +61,7 @@ import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig, get } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { SelectSize, SelectColor, SelectVariant, Strategy } from '../../types' +import type { SelectSize, SelectColor, SelectVariant, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { select } from '#ui/ui.config' diff --git a/src/runtime/components/forms/SelectMenu.vue b/src/runtime/components/forms/SelectMenu.vue index 8da44724..5c7e3cff 100644 --- a/src/runtime/components/forms/SelectMenu.vue +++ b/src/runtime/components/forms/SelectMenu.vue @@ -147,7 +147,7 @@ import { usePopper } from '../../composables/usePopper' import { useFormGroup } from '../../composables/useFormGroup' import { get, mergeConfig } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { SelectSize, SelectColor, SelectVariant, PopperOptions, Strategy } from '../../types' +import type { SelectSize, SelectColor, SelectVariant, PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { select, selectMenu } from '#ui/ui.config' diff --git a/src/runtime/components/forms/Textarea.vue b/src/runtime/components/forms/Textarea.vue index 41046003..f38a7633 100644 --- a/src/runtime/components/forms/Textarea.vue +++ b/src/runtime/components/forms/Textarea.vue @@ -28,7 +28,7 @@ import { defu } from 'defu' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig, looseToNumber } from '../../utils' -import type { TextareaSize, TextareaColor, TextareaVariant, Strategy } from '../../types' +import type { TextareaSize, TextareaColor, TextareaVariant, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { textarea } from '#ui/ui.config' diff --git a/src/runtime/components/forms/Toggle.vue b/src/runtime/components/forms/Toggle.vue index 917cd33a..8e815279 100644 --- a/src/runtime/components/forms/Toggle.vue +++ b/src/runtime/components/forms/Toggle.vue @@ -38,7 +38,7 @@ import UIcon from '../elements/Icon.vue' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig } from '../../utils' -import type { ToggleSize, ToggleColor, Strategy } from '../../types' +import type { ToggleSize, ToggleColor, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { toggle } from '#ui/ui.config' diff --git a/src/runtime/components/layout/Card.vue b/src/runtime/components/layout/Card.vue index 0e8dcd26..63aeb7d7 100644 --- a/src/runtime/components/layout/Card.vue +++ b/src/runtime/components/layout/Card.vue @@ -22,7 +22,7 @@ import type { PropType } from 'vue' import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types' +import type { Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { card } from '#ui/ui.config' diff --git a/src/runtime/components/layout/Container.vue b/src/runtime/components/layout/Container.vue index 517dbbeb..e71e4d8d 100644 --- a/src/runtime/components/layout/Container.vue +++ b/src/runtime/components/layout/Container.vue @@ -10,7 +10,7 @@ import type { PropType } from 'vue' import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types' +import type { Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { container } from '#ui/ui.config' diff --git a/src/runtime/components/layout/Divider.vue b/src/runtime/components/layout/Divider.vue index bc950ca8..3b7d667b 100644 --- a/src/runtime/components/layout/Divider.vue +++ b/src/runtime/components/layout/Divider.vue @@ -26,7 +26,7 @@ import UIcon from '../elements/Icon.vue' import UAvatar from '../elements/Avatar.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Avatar, DividerSize, Strategy } from '../../types' +import type { Avatar, DividerSize, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { divider } from '#ui/ui.config' diff --git a/src/runtime/components/layout/Skeleton.vue b/src/runtime/components/layout/Skeleton.vue index f316f1c7..1198fc17 100644 --- a/src/runtime/components/layout/Skeleton.vue +++ b/src/runtime/components/layout/Skeleton.vue @@ -8,7 +8,7 @@ import type { PropType } from 'vue' import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types' +import type { Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { skeleton } from '#ui/ui.config' diff --git a/src/runtime/components/navigation/Breadcrumb.vue b/src/runtime/components/navigation/Breadcrumb.vue index 2c83a5d3..106408d2 100644 --- a/src/runtime/components/navigation/Breadcrumb.vue +++ b/src/runtime/components/navigation/Breadcrumb.vue @@ -41,7 +41,7 @@ import UIcon from '../elements/Icon.vue' import ULink from '../elements/Link.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, getULinkProps } from '../../utils' -import type { BreadcrumbLink, Strategy } from '../../types' +import type { BreadcrumbLink, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { breadcrumb } from '#ui/ui.config' diff --git a/src/runtime/components/navigation/CommandPalette.vue b/src/runtime/components/navigation/CommandPalette.vue index 86d83b03..68cc6efd 100644 --- a/src/runtime/components/navigation/CommandPalette.vue +++ b/src/runtime/components/navigation/CommandPalette.vue @@ -75,7 +75,7 @@ import UButton from '../elements/Button.vue' import CommandPaletteGroup from './CommandPaletteGroup.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Group, Command, Button, Strategy } from '../../types' +import type { Group, Command, Button, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { commandPalette } from '#ui/ui.config' diff --git a/src/runtime/components/navigation/CommandPaletteGroup.vue b/src/runtime/components/navigation/CommandPaletteGroup.vue index 2810f4af..774925a0 100644 --- a/src/runtime/components/navigation/CommandPaletteGroup.vue +++ b/src/runtime/components/navigation/CommandPaletteGroup.vue @@ -76,7 +76,7 @@ import { ComboboxOption as HComboboxOption, provideUseId } from '@headlessui/vue import UIcon from '../elements/Icon.vue' import UAvatar from '../elements/Avatar.vue' import UKbd from '../elements/Kbd.vue' -import type { Command, Group } from '../../types' +import type { Command, Group } from '../../types/index' import { commandPalette } from '#ui/ui.config' import { useId } from '#imports' diff --git a/src/runtime/components/navigation/HorizontalNavigation.vue b/src/runtime/components/navigation/HorizontalNavigation.vue index a28c2384..ca9937f8 100644 --- a/src/runtime/components/navigation/HorizontalNavigation.vue +++ b/src/runtime/components/navigation/HorizontalNavigation.vue @@ -61,7 +61,7 @@ import UBadge from '../elements/Badge.vue' import ULink from '../elements/Link.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, getULinkProps } from '../../utils' -import type { HorizontalNavigationLink, Strategy } from '../../types' +import type { HorizontalNavigationLink, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { horizontalNavigation } from '#ui/ui.config' diff --git a/src/runtime/components/navigation/Pagination.vue b/src/runtime/components/navigation/Pagination.vue index 736e7eaa..af0ee1b8 100644 --- a/src/runtime/components/navigation/Pagination.vue +++ b/src/runtime/components/navigation/Pagination.vue @@ -74,7 +74,7 @@ import type { RouteLocationRaw } from '#vue-router' import UButton from '../elements/Button.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Button, ButtonSize, Strategy } from '../../types' +import type { Button, ButtonSize, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { pagination, button } from '#ui/ui.config' diff --git a/src/runtime/components/navigation/Tabs.vue b/src/runtime/components/navigation/Tabs.vue index 2f131fa0..f87c70d1 100644 --- a/src/runtime/components/navigation/Tabs.vue +++ b/src/runtime/components/navigation/Tabs.vue @@ -60,7 +60,7 @@ import { useResizeObserver } from '@vueuse/core' import UIcon from '../elements/Icon.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { TabItem, Strategy } from '../../types' +import type { TabItem, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { tabs } from '#ui/ui.config' diff --git a/src/runtime/components/navigation/VerticalNavigation.vue b/src/runtime/components/navigation/VerticalNavigation.vue index f1bec11d..d481707f 100644 --- a/src/runtime/components/navigation/VerticalNavigation.vue +++ b/src/runtime/components/navigation/VerticalNavigation.vue @@ -63,7 +63,7 @@ import ULink from '../elements/Link.vue' import UDivider from '../layout/Divider.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, getULinkProps } from '../../utils' -import type { VerticalNavigationLink, Strategy } from '../../types' +import type { VerticalNavigationLink, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { verticalNavigation } from '#ui/ui.config' diff --git a/src/runtime/components/overlays/ContextMenu.vue b/src/runtime/components/overlays/ContextMenu.vue index 28d1a4f9..99c095c0 100644 --- a/src/runtime/components/overlays/ContextMenu.vue +++ b/src/runtime/components/overlays/ContextMenu.vue @@ -22,7 +22,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { usePopper } from '../../composables/usePopper' import { mergeConfig } from '../../utils' -import type { PopperOptions, Strategy } from '../../types' +import type { PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { contextMenu } from '#ui/ui.config' diff --git a/src/runtime/components/overlays/Modal.vue b/src/runtime/components/overlays/Modal.vue index 4f18b60a..6c0c554b 100644 --- a/src/runtime/components/overlays/Modal.vue +++ b/src/runtime/components/overlays/Modal.vue @@ -32,7 +32,7 @@ import type { PropType } from 'vue' import { Dialog as HDialog, DialogPanel as HDialogPanel, TransitionRoot, TransitionChild, provideUseId } from '@headlessui/vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types' +import type { Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { modal } from '#ui/ui.config' diff --git a/src/runtime/components/overlays/Notification.vue b/src/runtime/components/overlays/Notification.vue index 35ebbe4d..94a3d725 100644 --- a/src/runtime/components/overlays/Notification.vue +++ b/src/runtime/components/overlays/Notification.vue @@ -52,7 +52,7 @@ import UButton from '../elements/Button.vue' import { useUI } from '../../composables/useUI' import { useTimer } from '../../composables/useTimer' import { mergeConfig } from '../../utils' -import type { Avatar, Button, NotificationColor, NotificationAction, Strategy } from '../../types' +import type { Avatar, Button, NotificationColor, NotificationAction, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { notification } from '#ui/ui.config' diff --git a/src/runtime/components/overlays/Notifications.vue b/src/runtime/components/overlays/Notifications.vue index b0e4e8fe..33e30ab1 100644 --- a/src/runtime/components/overlays/Notifications.vue +++ b/src/runtime/components/overlays/Notifications.vue @@ -27,7 +27,7 @@ import UNotification from './Notification.vue' import { useUI } from '../../composables/useUI' import { useToast } from '../../composables/useToast' import { mergeConfig } from '../../utils' -import type { Notification, Strategy } from '../../types' +import type { Notification, Strategy } from '../../types/index' import { useState } from '#imports' // @ts-expect-error import appConfig from '#build/app.config' diff --git a/src/runtime/components/overlays/Popover.vue b/src/runtime/components/overlays/Popover.vue index b4ea58fb..ff378ba3 100644 --- a/src/runtime/components/overlays/Popover.vue +++ b/src/runtime/components/overlays/Popover.vue @@ -43,7 +43,7 @@ import { Popover as HPopover, PopoverButton as HPopoverButton, PopoverPanel as H import { useUI } from '../../composables/useUI' import { usePopper } from '../../composables/usePopper' import { mergeConfig } from '../../utils' -import type { PopperOptions, Strategy } from '../../types' +import type { PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { popover } from '#ui/ui.config' diff --git a/src/runtime/components/overlays/Slideover.vue b/src/runtime/components/overlays/Slideover.vue index 4e7ad679..745f363e 100644 --- a/src/runtime/components/overlays/Slideover.vue +++ b/src/runtime/components/overlays/Slideover.vue @@ -20,7 +20,7 @@ import type { WritableComputedRef, PropType } from 'vue' import { Dialog as HDialog, DialogPanel as HDialogPanel, TransitionRoot, TransitionChild, provideUseId } from '@headlessui/vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types' +import type { Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { slideover } from '#ui/ui.config' @@ -165,4 +165,4 @@ export default defineComponent({ } } }) - \ No newline at end of file + diff --git a/src/runtime/components/overlays/Tooltip.vue b/src/runtime/components/overlays/Tooltip.vue index d75293c7..d2882bc2 100644 --- a/src/runtime/components/overlays/Tooltip.vue +++ b/src/runtime/components/overlays/Tooltip.vue @@ -36,7 +36,7 @@ import UKbd from '../elements/Kbd.vue' import { useUI } from '../../composables/useUI' import { usePopper } from '../../composables/usePopper' import { mergeConfig } from '../../utils' -import type { PopperOptions, Strategy } from '../../types' +import type { PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { tooltip } from '#ui/ui.config' diff --git a/src/runtime/composables/useUI.ts b/src/runtime/composables/useUI.ts index 03244757..b19107c5 100644 --- a/src/runtime/composables/useUI.ts +++ b/src/runtime/composables/useUI.ts @@ -2,7 +2,7 @@ import { computed, toValue, useAttrs } from 'vue' import type { Ref } from 'vue' import { useAppConfig } from '#imports' import { mergeConfig, omit, get } from '../utils' -import type { Strategy } from '../types' +import type { Strategy } from '../types/index' export const useUI = (key, $ui?: Ref & { strategy?: Strategy } | undefined>, $config?: Ref | T, $wrapperClass?: Ref, withAppConfig: boolean = false) => { const $attrs = useAttrs() diff --git a/src/runtime/utils/index.ts b/src/runtime/utils/index.ts index 184ab445..440c24be 100644 --- a/src/runtime/utils/index.ts +++ b/src/runtime/utils/index.ts @@ -1,6 +1,6 @@ import { defu, createDefu } from 'defu' import { extendTailwindMerge } from 'tailwind-merge' -import type { Strategy } from '../types' +import type { Strategy } from '../types/index' const customTwMerge = extendTailwindMerge({ extend: {