Skip to content

Commit fcc6a78

Browse files
committed
refactor: unify util/composables/util
they are unified to use a basic index namespace export. With all having both a basic export and export default.
1 parent c5d9406 commit fcc6a78

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+292
-91
lines changed

packages/bootstrap-vue-3/src/BootstrapVue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ import BTransition from './components/BTransition/BTransition.vue'
103103
export {useToast}
104104

105105
// Export utils
106-
export {BvEvent} from './utils/bvEvent'
106+
export {BvEvent} from './utils'
107107

108108
// Export available directives
109109
export {default as VBPopover} from './directives/BPopover'

packages/bootstrap-vue-3/src/components/BAlert.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import type {ColorVariant} from '../types'
1818
import {computed, onBeforeUnmount, ref, watch} from 'vue'
1919
import Alert from 'bootstrap/js/dist/alert'
20-
import {toInteger} from '../utils/number'
20+
import {toInteger} from '../utils'
2121
2222
interface BAlertProps {
2323
dismissLabel?: string

packages/bootstrap-vue-3/src/components/BAvatar/BAvatar.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,14 @@
2626

2727
<script setup lang="ts">
2828
// import type { BAvatarProps, BAvatarEmits, InputSize } from '../types/components'
29-
import {isEmptySlot} from '../../utils/dom'
29+
import {isEmptySlot, isNumber, isNumeric, isString, toFloat} from '../../utils'
3030
import type {BAvatarGroupParentData} from '../../types/components'
3131
import {computed, inject, StyleValue, useSlots} from 'vue'
3232
import type {ColorVariant} from '../../types'
33-
import {isNumber, isNumeric, isString} from '../../utils/inspect'
34-
import {toFloat} from '../../utils/number'
3533
import {injectionKey} from './BAvatarGroup.vue'
3634
3735
interface BAvatarProps {
38-
alt?: string
36+
alt?: string // TODO each complex variant should contain a note about it's type
3937
ariaLabel?: string
4038
badge?: boolean | string
4139
badgeLeft?: boolean

packages/bootstrap-vue-3/src/components/BAvatar/BAvatarGroup.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
import type {BAvatarGroupParentData} from '../../types/components'
1212
import {computed, InjectionKey, provide, StyleValue} from 'vue'
1313
import type {ColorVariant} from '../../types'
14-
import {mathMax, mathMin} from '../../utils/math'
15-
import {toFloat} from '../../utils/number'
14+
import {isNumeric, isString, mathMax, mathMin, toFloat} from '../../utils'
1615
import {computeSize} from './BAvatar.vue'
17-
import {isNumeric, isString} from '../../utils/inspect'
1816
1917
interface BAvatarGroupProps {
2018
overlap?: number | string

packages/bootstrap-vue-3/src/components/BBadge/BBadge.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
</template>
66

77
<script lang="ts">
8-
import {omit} from '../../utils/object'
8+
import {isLink, omit, pluckProps} from '../../utils'
99
import {computed, defineComponent, PropType} from 'vue'
1010
import type {ColorVariant} from '../../types'
1111
import {BLINK_PROPS} from '../BLink/BLink.vue'
12-
import {isLink} from '../../utils/router'
13-
import {pluckProps} from '../../utils/props'
1412
1513
const linkProps = omit(BLINK_PROPS, ['event', 'routerTag'])
1614

packages/bootstrap-vue-3/src/components/BBreadcrumb/BBreadcrumbItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</template>
1313

1414
<script lang="ts">
15-
import {omit} from '../../utils/object'
15+
import {omit} from '../../utils'
1616
import {computed, defineComponent} from 'vue'
1717
import {BLINK_PROPS} from '../BLink/BLink.vue'
1818

packages/bootstrap-vue-3/src/components/BCol.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<script lang="ts">
88
import {computed, defineComponent, PropType} from 'vue'
99
import type {Alignment} from '../types'
10-
import getBreakpointProps from '../utils/getBreakpointProps'
11-
import getClasses from '../utils/getClasses'
10+
import {getBreakpointProps, getClasses} from '../utils'
1211
1312
const breakpointCol = getBreakpointProps('', [], {type: [Boolean, String, Number], default: false})
1413
const breakpointOffset = getBreakpointProps('offset', [''], {type: [String, Number], default: null})

packages/bootstrap-vue-3/src/components/BCollapse.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import {computed, onMounted, ref, watch} from 'vue'
1717
import Collapse from 'bootstrap/js/dist/collapse'
1818
import {useEventListener} from '../composables'
19-
import getID from '../utils/getID'
19+
import {getID} from '../utils'
2020
2121
interface BCollapseProps {
2222
accordion?: string

packages/bootstrap-vue-3/src/components/BDropdown/BDropdown.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import Dropdown from 'bootstrap/js/dist/dropdown'
4747
import {ComponentPublicInstance, computed, onMounted, ref} from 'vue'
4848
import BButton from '../BButton/BButton.vue'
4949
import type {ButtonType, ButtonVariant, Size} from '../../types'
50-
import mergeDeep from '../../utils/mergeDeep'
50+
import mergeDeep from '../../utils'
5151
import {useEventListener, useId} from '../../composables'
5252
5353
// TODO it seems that some of these props are actually just Popper options

packages/bootstrap-vue-3/src/components/BFormGroup/BFormGroup.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<script lang="ts">
22
import {useId} from '../../composables'
33
import {RX_SPACE_SPLIT} from '../../constants/regex'
4-
import {arrayIncludes} from '../../utils/array'
5-
import {cssEscape} from '../../utils/css-escape'
64
import {
5+
arrayIncludes,
76
attemptFocus,
7+
cssEscape,
88
getAttr,
9+
getID,
10+
IS_BROWSER,
11+
isBoolean,
912
isVisible,
13+
normalizeSlot,
1014
removeAttr,
1115
select,
1216
selectAll,
1317
setAttr,
14-
} from '../../utils/dom'
15-
import {IS_BROWSER} from '../../utils/env'
16-
import getID from '../../utils/getID'
17-
import {isBoolean} from '../../utils/inspect'
18-
import {normalizeSlot} from '../../utils/normalize-slot'
19-
import {stringToInteger} from '../../utils/number'
20-
import {suffixPropName} from '../../utils/props'
18+
stringToInteger,
19+
suffixPropName,
20+
} from '../../utils'
2121
import {computed, defineComponent, h, nextTick, onMounted, ref, watch} from 'vue'
2222
import BCol from '../BCol.vue'
2323
import BFormInvalidFeedback from '../BForm/BFormInvalidFeedback.vue'

0 commit comments

Comments
 (0)