GitHub

diff --git a/src/components/media/media-aside.js b/src/components/media/media-aside.js index d14c39f6760..e9bf5c4dd58 100644 --- a/src/components/media/media-aside.js +++ b/src/components/media/media-aside.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_MEDIA_ASIDE } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -17,7 +17,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BMediaAside = /*#__PURE__*/ Vue.extend({ +export const BMediaAside = /*#__PURE__*/ extend({ name: NAME_MEDIA_ASIDE, functional: true, props, diff --git a/src/components/media/media-body.js b/src/components/media/media-body.js index 5695b29884f..95818403a41 100644 --- a/src/components/media/media-body.js +++ b/src/components/media/media-body.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_MEDIA_BODY } from '../../constants/components' import { PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -15,7 +15,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BMediaBody = /*#__PURE__*/ Vue.extend({ +export const BMediaBody = /*#__PURE__*/ extend({ name: NAME_MEDIA_BODY, functional: true, props, diff --git a/src/components/media/media.js b/src/components/media/media.js index 9ab4b0515d1..da2419acf79 100644 --- a/src/components/media/media.js +++ b/src/components/media/media.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_MEDIA } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props' import { SLOT_NAME_ASIDE, SLOT_NAME_DEFAULT } from '../../constants/slots' @@ -22,7 +22,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BMedia = /*#__PURE__*/ Vue.extend({ +export const BMedia = /*#__PURE__*/ extend({ name: NAME_MEDIA, functional: true, props, diff --git a/src/components/modal/helpers/modal-manager.js b/src/components/modal/helpers/modal-manager.js index af4e23a9fa0..edb4e34780d 100644 --- a/src/components/modal/helpers/modal-manager.js +++ b/src/components/modal/helpers/modal-manager.js @@ -3,7 +3,7 @@ * Handles controlling modal stacking zIndexes and body adjustments/classes */ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { IS_BROWSER } from '../../../constants/env' import { addClass, @@ -35,7 +35,7 @@ const SELECTOR_NAVBAR_TOGGLER = '.navbar-toggler' // --- Main component --- // @vue/component -const ModalManager = /*#__PURE__*/ Vue.extend({ +const ModalManager = /*#__PURE__*/ extend({ data() { return { modals: [], diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js index a66eabf0bda..071c9933c78 100644 --- a/src/components/modal/modal.js +++ b/src/components/modal/modal.js @@ -1,4 +1,4 @@ -import { COMPONENT_UID_KEY, Vue } from '../../vue' +import { COMPONENT_UID_KEY, extend } from '../../vue' import { NAME_MODAL } from '../../constants/components' import { IS_BROWSER } from '../../constants/env' import { @@ -176,7 +176,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BModal = /*#__PURE__*/ Vue.extend({ +export const BModal = /*#__PURE__*/ extend({ name: NAME_MODAL, mixins: [ attrsMixin, diff --git a/src/components/nav/nav-form.js b/src/components/nav/nav-form.js index 2a95547019f..bb236016358 100644 --- a/src/components/nav/nav-form.js +++ b/src/components/nav/nav-form.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_NAV_FORM } from '../../constants/components' import { PROP_TYPE_ARRAY_OBJECT_STRING } from '../../constants/props' import { omit, sortKeys } from '../../utils/object' @@ -20,7 +20,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BNavForm = /*#__PURE__*/ Vue.extend({ +export const BNavForm = /*#__PURE__*/ extend({ name: NAME_NAV_FORM, functional: true, props, diff --git a/src/components/nav/nav-item-dropdown.js b/src/components/nav/nav-item-dropdown.js index 2de02dadc54..0b8cee92287 100644 --- a/src/components/nav/nav-item-dropdown.js +++ b/src/components/nav/nav-item-dropdown.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_NAV_ITEM_DROPDOWN } from '../../constants/components' import { SLOT_NAME_BUTTON_CONTENT, SLOT_NAME_DEFAULT, SLOT_NAME_TEXT } from '../../constants/slots' import { htmlOrText } from '../../utils/html' @@ -32,7 +32,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BNavItemDropdown = /*#__PURE__*/ Vue.extend({ +export const BNavItemDropdown = /*#__PURE__*/ extend({ name: NAME_NAV_ITEM_DROPDOWN, mixins: [idMixin, dropdownMixin, normalizeSlotMixin], props, diff --git a/src/components/nav/nav-item.js b/src/components/nav/nav-item.js index c634f9c556b..f84ecbf941f 100644 --- a/src/components/nav/nav-item.js +++ b/src/components/nav/nav-item.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_NAV_ITEM } from '../../constants/components' import { PROP_TYPE_ARRAY_OBJECT_STRING, PROP_TYPE_OBJECT } from '../../constants/props' import { omit, sortKeys } from '../../utils/object' @@ -21,7 +21,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BNavItem = /*#__PURE__*/ Vue.extend({ +export const BNavItem = /*#__PURE__*/ extend({ name: NAME_NAV_ITEM, functional: true, props, diff --git a/src/components/nav/nav-text.js b/src/components/nav/nav-text.js index 98ad5f29f6a..e392c27dc5d 100644 --- a/src/components/nav/nav-text.js +++ b/src/components/nav/nav-text.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_NAV_TEXT } from '../../constants/components' // --- Props --- @@ -8,7 +8,7 @@ export const props = {} // --- Main component --- // @vue/component -export const BNavText = /*#__PURE__*/ Vue.extend({ +export const BNavText = /*#__PURE__*/ extend({ name: NAME_NAV_TEXT, functional: true, props, diff --git a/src/components/nav/nav.js b/src/components/nav/nav.js index 195ac940a5f..173924536dc 100644 --- a/src/components/nav/nav.js +++ b/src/components/nav/nav.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_NAV } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -31,7 +31,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BNav = /*#__PURE__*/ Vue.extend({ +export const BNav = /*#__PURE__*/ extend({ name: NAME_NAV, functional: true, props, diff --git a/src/components/navbar/navbar-brand.js b/src/components/navbar/navbar-brand.js index 65f0387c4e5..39f005d297f 100644 --- a/src/components/navbar/navbar-brand.js +++ b/src/components/navbar/navbar-brand.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_NAVBAR_BRAND } from '../../constants/components' import { PROP_TYPE_STRING } from '../../constants/props' import { omit, sortKeys } from '../../utils/object' @@ -22,7 +22,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BNavbarBrand = /*#__PURE__*/ Vue.extend({ +export const BNavbarBrand = /*#__PURE__*/ extend({ name: NAME_NAVBAR_BRAND, functional: true, props, diff --git a/src/components/navbar/navbar-nav.js b/src/components/navbar/navbar-nav.js index 19684ee8a53..3b049267f10 100644 --- a/src/components/navbar/navbar-nav.js +++ b/src/components/navbar/navbar-nav.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_NAVBAR_NAV } from '../../constants/components' import { pick } from '../../utils/object' import { makePropsConfigurable } from '../../utils/props' @@ -21,7 +21,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BNavbarNav = /*#__PURE__*/ Vue.extend({ +export const BNavbarNav = /*#__PURE__*/ extend({ name: NAME_NAVBAR_NAV, functional: true, props, diff --git a/src/components/navbar/navbar-toggle.js b/src/components/navbar/navbar-toggle.js index 044664569f7..8b0363a5e21 100644 --- a/src/components/navbar/navbar-toggle.js +++ b/src/components/navbar/navbar-toggle.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_COLLAPSE, NAME_NAVBAR_TOGGLE } from '../../constants/components' import { EVENT_NAME_CLICK } from '../../constants/events' import { PROP_TYPE_ARRAY_STRING, PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props' @@ -30,7 +30,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BNavbarToggle = /*#__PURE__*/ Vue.extend({ +export const BNavbarToggle = /*#__PURE__*/ extend({ name: NAME_NAVBAR_TOGGLE, directives: { VBToggle }, mixins: [listenOnRootMixin, normalizeSlotMixin], diff --git a/src/components/navbar/navbar.js b/src/components/navbar/navbar.js index 0c6d7e1afc3..c4add85e11b 100644 --- a/src/components/navbar/navbar.js +++ b/src/components/navbar/navbar.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_NAVBAR } from '../../constants/components' import { PROP_TYPE_BOOLEAN, @@ -29,7 +29,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BNavbar = /*#__PURE__*/ Vue.extend({ +export const BNavbar = /*#__PURE__*/ extend({ name: NAME_NAVBAR, mixins: [normalizeSlotMixin], provide() { diff --git a/src/components/overlay/overlay.js b/src/components/overlay/overlay.js index 99e56568450..016c1c77e7d 100644 --- a/src/components/overlay/overlay.js +++ b/src/components/overlay/overlay.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_OVERLAY } from '../../constants/components' import { EVENT_NAME_CLICK, EVENT_NAME_HIDDEN, EVENT_NAME_SHOWN } from '../../constants/events' import { @@ -52,7 +52,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BOverlay = /*#__PURE__*/ Vue.extend({ +export const BOverlay = /*#__PURE__*/ extend({ name: NAME_OVERLAY, mixins: [normalizeSlotMixin], props, diff --git a/src/components/pagination-nav/pagination-nav.js b/src/components/pagination-nav/pagination-nav.js index 5ce0f129c4e..ae4031f886c 100644 --- a/src/components/pagination-nav/pagination-nav.js +++ b/src/components/pagination-nav/pagination-nav.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_PAGINATION_NAV } from '../../constants/components' import { IS_BROWSER } from '../../constants/env' import { EVENT_NAME_CHANGE, EVENT_NAME_PAGE_CLICK } from '../../constants/events' @@ -64,7 +64,7 @@ const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BPaginationNav = /*#__PURE__*/ Vue.extend({ +export const BPaginationNav = /*#__PURE__*/ extend({ name: NAME_PAGINATION_NAV, // The render function is brought in via the pagination mixin mixins: [paginationMixin], diff --git a/src/components/pagination/pagination.js b/src/components/pagination/pagination.js index 9bd58c66bd4..d43b19e30b1 100644 --- a/src/components/pagination/pagination.js +++ b/src/components/pagination/pagination.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_PAGINATION } from '../../constants/components' import { EVENT_NAME_CHANGE, EVENT_NAME_PAGE_CLICK } from '../../constants/events' import { PROP_TYPE_NUMBER_STRING, PROP_TYPE_STRING } from '../../constants/props' @@ -39,7 +39,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BPagination = /*#__PURE__*/ Vue.extend({ +export const BPagination = /*#__PURE__*/ extend({ name: NAME_PAGINATION, // The render function is brought in via the `paginationMixin` mixins: [paginationMixin], diff --git a/src/components/popover/helpers/bv-popover-template.js b/src/components/popover/helpers/bv-popover-template.js index 4eca3b1b3ef..7b497ea005b 100644 --- a/src/components/popover/helpers/bv-popover-template.js +++ b/src/components/popover/helpers/bv-popover-template.js @@ -1,10 +1,10 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { NAME_POPOVER_TEMPLATE } from '../../../constants/components' import { isFunction, isUndefinedOrNull } from '../../../utils/inspect' import { BVTooltipTemplate } from '../../tooltip/helpers/bv-tooltip-template' // @vue/component -export const BVPopoverTemplate = /*#__PURE__*/ Vue.extend({ +export const BVPopoverTemplate = /*#__PURE__*/ extend({ name: NAME_POPOVER_TEMPLATE, extends: BVTooltipTemplate, computed: { diff --git a/src/components/popover/helpers/bv-popover.js b/src/components/popover/helpers/bv-popover.js index 4f523ed59bd..b146e3ea1e8 100644 --- a/src/components/popover/helpers/bv-popover.js +++ b/src/components/popover/helpers/bv-popover.js @@ -4,13 +4,13 @@ // Handles trigger events, etc. // Instantiates template on demand -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { NAME_POPOVER_HELPER } from '../../../constants/components' import { BVTooltip } from '../../tooltip/helpers/bv-tooltip' import { BVPopoverTemplate } from './bv-popover-template' // @vue/component -export const BVPopover = /*#__PURE__*/ Vue.extend({ +export const BVPopover = /*#__PURE__*/ extend({ name: NAME_POPOVER_HELPER, extends: BVTooltip, computed: { diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js index f70123e3ab5..e68f75cf773 100644 --- a/src/components/popover/popover.js +++ b/src/components/popover/popover.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_POPOVER } from '../../constants/components' import { EVENT_NAME_CLICK } from '../../constants/events' import { PROP_TYPE_ARRAY_STRING, PROP_TYPE_STRING } from '../../constants/props' @@ -23,7 +23,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BPopover = /*#__PURE__*/ Vue.extend({ +export const BPopover = /*#__PURE__*/ extend({ name: NAME_POPOVER, extends: BTooltip, inheritAttrs: false, diff --git a/src/components/progress/progress-bar.js b/src/components/progress/progress-bar.js index ae8ced02ec2..02af3d0d4e3 100644 --- a/src/components/progress/progress-bar.js +++ b/src/components/progress/progress-bar.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_PROGRESS_BAR } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_NUMBER_STRING, PROP_TYPE_STRING } from '../../constants/props' import { htmlOrText } from '../../utils/html' @@ -30,7 +30,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BProgressBar = /*#__PURE__*/ Vue.extend({ +export const BProgressBar = /*#__PURE__*/ extend({ name: NAME_PROGRESS_BAR, mixins: [normalizeSlotMixin], inject: { diff --git a/src/components/progress/progress.js b/src/components/progress/progress.js index 341b3d6669f..d0c50723c96 100644 --- a/src/components/progress/progress.js +++ b/src/components/progress/progress.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_PROGRESS } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_NUMBER_STRING, PROP_TYPE_STRING } from '../../constants/props' import { omit, sortKeys } from '../../utils/object' @@ -27,7 +27,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BProgress = /*#__PURE__*/ Vue.extend({ +export const BProgress = /*#__PURE__*/ extend({ name: NAME_PROGRESS, mixins: [normalizeSlotMixin], provide() { diff --git a/src/components/sidebar/sidebar.js b/src/components/sidebar/sidebar.js index 5d676ebc22f..62af71634dd 100644 --- a/src/components/sidebar/sidebar.js +++ b/src/components/sidebar/sidebar.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_COLLAPSE, NAME_SIDEBAR } from '../../constants/components' import { IS_BROWSER } from '../../constants/env' import { EVENT_NAME_CHANGE, EVENT_NAME_HIDDEN, EVENT_NAME_SHOWN } from '../../constants/events' @@ -201,7 +201,7 @@ const renderBackdrop = (h, ctx) => { // --- Main component --- // @vue/component -export const BSidebar = /*#__PURE__*/ Vue.extend({ +export const BSidebar = /*#__PURE__*/ extend({ name: NAME_SIDEBAR, mixins: [attrsMixin, idMixin, modelMixin, listenOnRootMixin, normalizeSlotMixin], inheritAttrs: false, diff --git a/src/components/skeleton/skeleton-icon.js b/src/components/skeleton/skeleton-icon.js index a0234706988..c14fbfce4e6 100644 --- a/src/components/skeleton/skeleton-icon.js +++ b/src/components/skeleton/skeleton-icon.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_SKELETON_ICON } from '../../constants/components' import { PROP_TYPE_OBJECT, PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -18,7 +18,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BSkeletonIcon = /*#__PURE__*/ Vue.extend({ +export const BSkeletonIcon = /*#__PURE__*/ extend({ name: NAME_SKELETON_ICON, functional: true, props, diff --git a/src/components/skeleton/skeleton-img.js b/src/components/skeleton/skeleton-img.js index 3b6d6dd1363..eb8367fd219 100644 --- a/src/components/skeleton/skeleton-img.js +++ b/src/components/skeleton/skeleton-img.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_SKELETON_IMG } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -23,7 +23,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BSkeletonImg = /*#__PURE__*/ Vue.extend({ +export const BSkeletonImg = /*#__PURE__*/ extend({ name: NAME_SKELETON_IMG, functional: true, props, diff --git a/src/components/skeleton/skeleton-table.js b/src/components/skeleton/skeleton-table.js index 29251228fb4..3371a872c0e 100644 --- a/src/components/skeleton/skeleton-table.js +++ b/src/components/skeleton/skeleton-table.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_SKELETON_TABLE } from '../../constants/components' import { PROP_TYPE_BOOLEAN, @@ -32,7 +32,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BSkeletonTable = /*#__PURE__*/ Vue.extend({ +export const BSkeletonTable = /*#__PURE__*/ extend({ name: NAME_SKELETON_TABLE, functional: true, props, diff --git a/src/components/skeleton/skeleton-wrapper.js b/src/components/skeleton/skeleton-wrapper.js index 59d0b32f2fa..9a9159d7b21 100644 --- a/src/components/skeleton/skeleton-wrapper.js +++ b/src/components/skeleton/skeleton-wrapper.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_SKELETON_WRAPPER } from '../../constants/components' import { PROP_TYPE_BOOLEAN } from '../../constants/props' import { SLOT_NAME_DEFAULT, SLOT_NAME_LOADING } from '../../constants/slots' @@ -17,7 +17,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BSkeletonWrapper = /*#__PURE__*/ Vue.extend({ +export const BSkeletonWrapper = /*#__PURE__*/ extend({ name: NAME_SKELETON_WRAPPER, functional: true, props, diff --git a/src/components/skeleton/skeleton.js b/src/components/skeleton/skeleton.js index 42fd56ee25e..f62679806a4 100644 --- a/src/components/skeleton/skeleton.js +++ b/src/components/skeleton/skeleton.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_SKELETON } from '../../constants/components' import { PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -20,7 +20,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BSkeleton = /*#__PURE__*/ Vue.extend({ +export const BSkeleton = /*#__PURE__*/ extend({ name: NAME_SKELETON, functional: true, props, diff --git a/src/components/spinner/spinner.js b/src/components/spinner/spinner.js index ac8568e1868..ebf2f5047a4 100644 --- a/src/components/spinner/spinner.js +++ b/src/components/spinner/spinner.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_SPINNER } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props' import { SLOT_NAME_LABEL } from '../../constants/slots' @@ -22,7 +22,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BSpinner = /*#__PURE__*/ Vue.extend({ +export const BSpinner = /*#__PURE__*/ extend({ name: NAME_SPINNER, functional: true, props, diff --git a/src/components/table/helpers/mixin-bottom-row.js b/src/components/table/helpers/mixin-bottom-row.js index 0a425bb010b..73a268a765a 100644 --- a/src/components/table/helpers/mixin-bottom-row.js +++ b/src/components/table/helpers/mixin-bottom-row.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { SLOT_NAME_BOTTOM_ROW } from '../../../constants/slots' import { isFunction } from '../../../utils/inspect' import { BTr } from '../tr' @@ -10,7 +10,7 @@ export const props = {} // --- Mixin --- // @vue/component -export const bottomRowMixin = Vue.extend({ +export const bottomRowMixin = extend({ props, methods: { renderBottomRow() { diff --git a/src/components/table/helpers/mixin-busy.js b/src/components/table/helpers/mixin-busy.js index 59781330b89..bb0e161a34e 100644 --- a/src/components/table/helpers/mixin-busy.js +++ b/src/components/table/helpers/mixin-busy.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { MODEL_EVENT_NAME_PREFIX } from '../../../constants/events' import { PROP_TYPE_BOOLEAN } from '../../../constants/props' import { SLOT_NAME_TABLE_BUSY } from '../../../constants/slots' @@ -22,7 +22,7 @@ export const props = { // --- Mixin --- // @vue/component -export const busyMixin = Vue.extend({ +export const busyMixin = extend({ props, data() { return { diff --git a/src/components/table/helpers/mixin-caption.js b/src/components/table/helpers/mixin-caption.js index 377a65deb5b..ace7eb5a5b7 100644 --- a/src/components/table/helpers/mixin-caption.js +++ b/src/components/table/helpers/mixin-caption.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { PROP_TYPE_STRING } from '../../../constants/props' import { SLOT_NAME_TABLE_CAPTION } from '../../../constants/slots' import { htmlOrText } from '../../../utils/html' @@ -16,7 +16,7 @@ export const props = { // --- Mixin --- // @vue/component -export const captionMixin = Vue.extend({ +export const captionMixin = extend({ props, computed: { captionId() { diff --git a/src/components/table/helpers/mixin-colgroup.js b/src/components/table/helpers/mixin-colgroup.js index 1d2cf988bb1..575bca8a681 100644 --- a/src/components/table/helpers/mixin-colgroup.js +++ b/src/components/table/helpers/mixin-colgroup.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { SLOT_NAME_TABLE_COLGROUP } from '../../../constants/slots' // --- Props --- @@ -8,7 +8,7 @@ export const props = {} // --- Mixin --- // @vue/component -export const colgroupMixin = Vue.extend({ +export const colgroupMixin = extend({ methods: { renderColgroup() { const { computedFields: fields } = this diff --git a/src/components/table/helpers/mixin-empty.js b/src/components/table/helpers/mixin-empty.js index de4fad4ad66..eeac5ddf8e8 100644 --- a/src/components/table/helpers/mixin-empty.js +++ b/src/components/table/helpers/mixin-empty.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../../constants/props' import { SLOT_NAME_EMPTY, @@ -25,7 +25,7 @@ export const props = { // --- Mixin --- // @vue/component -export const emptyMixin = Vue.extend({ +export const emptyMixin = extend({ props, methods: { renderEmpty() { diff --git a/src/components/table/helpers/mixin-filtering.js b/src/components/table/helpers/mixin-filtering.js index 6e6a2e9ff0c..62b6097df6d 100644 --- a/src/components/table/helpers/mixin-filtering.js +++ b/src/components/table/helpers/mixin-filtering.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { NAME_TABLE } from '../../../constants/components' import { EVENT_NAME_FILTERED } from '../../../constants/events' import { @@ -40,7 +40,7 @@ export const props = { // --- Mixin --- // @vue/component -export const filteringMixin = Vue.extend({ +export const filteringMixin = extend({ props, data() { return { diff --git a/src/components/table/helpers/mixin-items.js b/src/components/table/helpers/mixin-items.js index f1f1045b810..6fdeba7170b 100644 --- a/src/components/table/helpers/mixin-items.js +++ b/src/components/table/helpers/mixin-items.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { EVENT_NAME_CONTEXT_CHANGED } from '../../../constants/events' import { PROP_TYPE_ARRAY, PROP_TYPE_STRING } from '../../../constants/props' import { useParentMixin } from '../../../mixins/use-parent' @@ -44,7 +44,7 @@ export const props = sortKeys({ // --- Mixin --- // @vue/component -export const itemsMixin = Vue.extend({ +export const itemsMixin = extend({ mixins: [modelMixin, useParentMixin], props, data() { diff --git a/src/components/table/helpers/mixin-pagination.js b/src/components/table/helpers/mixin-pagination.js index e775871feff..e06796d0562 100644 --- a/src/components/table/helpers/mixin-pagination.js +++ b/src/components/table/helpers/mixin-pagination.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { PROP_TYPE_NUMBER_STRING } from '../../../constants/props' import { mathMax } from '../../../utils/math' import { toInteger } from '../../../utils/number' @@ -15,7 +15,7 @@ export const props = { // --- Mixin --- // @vue/component -export const paginationMixin = Vue.extend({ +export const paginationMixin = extend({ props, computed: { localPaging() { diff --git a/src/components/table/helpers/mixin-provider.js b/src/components/table/helpers/mixin-provider.js index a338aa10dba..3a126dd278f 100644 --- a/src/components/table/helpers/mixin-provider.js +++ b/src/components/table/helpers/mixin-provider.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { NAME_TABLE } from '../../../constants/components' import { EVENT_NAME_REFRESH, EVENT_NAME_REFRESHED } from '../../../constants/events' import { @@ -36,7 +36,7 @@ export const props = { // --- Mixin --- // @vue/component -export const providerMixin = Vue.extend({ +export const providerMixin = extend({ mixins: [listenOnRootMixin], props, computed: { diff --git a/src/components/table/helpers/mixin-selectable.js b/src/components/table/helpers/mixin-selectable.js index 5629caf4fcc..a0a6fd32102 100644 --- a/src/components/table/helpers/mixin-selectable.js +++ b/src/components/table/helpers/mixin-selectable.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { EVENT_NAME_CONTEXT_CHANGED, EVENT_NAME_FILTERED, @@ -36,7 +36,7 @@ export const props = { // --- Mixin --- // @vue/component -export const selectableMixin = Vue.extend({ +export const selectableMixin = extend({ props, data() { return { diff --git a/src/components/table/helpers/mixin-sorting.js b/src/components/table/helpers/mixin-sorting.js index b71a5b84218..b8b24f2e8d0 100644 --- a/src/components/table/helpers/mixin-sorting.js +++ b/src/components/table/helpers/mixin-sorting.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { EVENT_NAME_HEAD_CLICKED, EVENT_NAME_SORT_CHANGED, @@ -70,7 +70,7 @@ export const props = { // --- Mixin --- // @vue/component -export const sortingMixin = Vue.extend({ +export const sortingMixin = extend({ props, data() { return { diff --git a/src/components/table/helpers/mixin-stacked.js b/src/components/table/helpers/mixin-stacked.js index ab5c4d69757..2499805cba6 100644 --- a/src/components/table/helpers/mixin-stacked.js +++ b/src/components/table/helpers/mixin-stacked.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { PROP_TYPE_BOOLEAN_STRING } from '../../../constants/props' import { makeProp } from '../../../utils/props' @@ -11,7 +11,7 @@ export const props = { // --- Mixin --- // @vue/component -export const stackedMixin = Vue.extend({ +export const stackedMixin = extend({ props, computed: { isStacked() { diff --git a/src/components/table/helpers/mixin-table-renderer.js b/src/components/table/helpers/mixin-table-renderer.js index aee24480a69..f88c3f0282a 100644 --- a/src/components/table/helpers/mixin-table-renderer.js +++ b/src/components/table/helpers/mixin-table-renderer.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { PROP_TYPE_ARRAY_OBJECT_STRING, PROP_TYPE_BOOLEAN, @@ -38,7 +38,7 @@ export const props = { // --- Mixin --- // @vue/component -export const tableRendererMixin = Vue.extend({ +export const tableRendererMixin = extend({ mixins: [attrsMixin], provide() { return { diff --git a/src/components/table/helpers/mixin-tbody-row.js b/src/components/table/helpers/mixin-tbody-row.js index b11642045b0..02733509e55 100644 --- a/src/components/table/helpers/mixin-tbody-row.js +++ b/src/components/table/helpers/mixin-tbody-row.js @@ -1,4 +1,4 @@ -import { Vue, REF_FOR_KEY } from '../../../vue' +import { extend, REF_FOR_KEY } from '../../../vue' import { EVENT_NAME_ROW_CLICKED, EVENT_NAME_ROW_HOVERED, @@ -32,7 +32,7 @@ export const props = { // --- Mixin --- // @vue/component -export const tbodyRowMixin = Vue.extend({ +export const tbodyRowMixin = extend({ mixins: [useParentMixin], props, methods: { diff --git a/src/components/table/helpers/mixin-tbody.js b/src/components/table/helpers/mixin-tbody.js index 451a328776f..a40f3493348 100644 --- a/src/components/table/helpers/mixin-tbody.js +++ b/src/components/table/helpers/mixin-tbody.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { EVENT_NAME_ROW_CLICKED, EVENT_NAME_ROW_CONTEXTMENU, @@ -40,7 +40,7 @@ export const props = sortKeys({ // --- Mixin --- // @vue/component -export const tbodyMixin = Vue.extend({ +export const tbodyMixin = extend({ mixins: [tbodyRowMixin], props, beforeDestroy() { diff --git a/src/components/table/helpers/mixin-tfoot.js b/src/components/table/helpers/mixin-tfoot.js index 222d524b3ec..5248642cd1e 100644 --- a/src/components/table/helpers/mixin-tfoot.js +++ b/src/components/table/helpers/mixin-tfoot.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { PROP_TYPE_ARRAY_OBJECT_STRING, PROP_TYPE_BOOLEAN, @@ -24,7 +24,7 @@ export const props = { // --- Mixin --- // @vue/component -export const tfootMixin = Vue.extend({ +export const tfootMixin = extend({ props, methods: { renderTFootCustom() { diff --git a/src/components/table/helpers/mixin-thead.js b/src/components/table/helpers/mixin-thead.js index c3321f97ff8..62690080194 100644 --- a/src/components/table/helpers/mixin-thead.js +++ b/src/components/table/helpers/mixin-thead.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { EVENT_NAME_HEAD_CLICKED } from '../../../constants/events' import { CODE_ENTER, CODE_SPACE } from '../../../constants/key-codes' import { PROP_TYPE_ARRAY_OBJECT_STRING, PROP_TYPE_STRING } from '../../../constants/props' @@ -38,7 +38,7 @@ export const props = { // --- Mixin --- // @vue/component -export const theadMixin = Vue.extend({ +export const theadMixin = extend({ props, methods: { fieldClasses(field) { diff --git a/src/components/table/helpers/mixin-top-row.js b/src/components/table/helpers/mixin-top-row.js index ee27d18de4a..df77f19e2ea 100644 --- a/src/components/table/helpers/mixin-top-row.js +++ b/src/components/table/helpers/mixin-top-row.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { SLOT_NAME_TOP_ROW } from '../../../constants/slots' import { isFunction } from '../../../utils/inspect' import { BTr } from '../tr' @@ -10,7 +10,7 @@ export const props = {} // --- Mixin --- // @vue/component -export const topRowMixin = Vue.extend({ +export const topRowMixin = extend({ methods: { renderTopRow() { const { computedFields: fields, stacked, tbodyTrClass, tbodyTrAttr } = this diff --git a/src/components/table/table-lite.js b/src/components/table/table-lite.js index 4302ec07d5e..c31f63aa117 100644 --- a/src/components/table/table-lite.js +++ b/src/components/table/table-lite.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TABLE_LITE } from '../../constants/components' import { sortKeys } from '../../utils/object' import { makePropsConfigurable } from '../../utils/props' @@ -35,7 +35,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BTableLite = /*#__PURE__*/ Vue.extend({ +export const BTableLite = /*#__PURE__*/ extend({ name: NAME_TABLE_LITE, // Order of mixins is important! // They are merged from first to last, followed by this component diff --git a/src/components/table/table-simple.js b/src/components/table/table-simple.js index 1852d0bb074..c7d59256ce6 100644 --- a/src/components/table/table-simple.js +++ b/src/components/table/table-simple.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TABLE_SIMPLE } from '../../constants/components' import { sortKeys } from '../../utils/object' import { makePropsConfigurable } from '../../utils/props' @@ -23,7 +23,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BTableSimple = /*#__PURE__*/ Vue.extend({ +export const BTableSimple = /*#__PURE__*/ extend({ name: NAME_TABLE_SIMPLE, // Order of mixins is important! // They are merged from first to last, followed by this component diff --git a/src/components/table/table.js b/src/components/table/table.js index 03bea65798d..ea32d30562f 100644 --- a/src/components/table/table.js +++ b/src/components/table/table.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TABLE } from '../../constants/components' import { sortKeys } from '../../utils/object' import { makePropsConfigurable } from '../../utils/props' @@ -53,7 +53,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BTable = /*#__PURE__*/ Vue.extend({ +export const BTable = /*#__PURE__*/ extend({ name: NAME_TABLE, // Order of mixins is important! // They are merged from first to last, followed by this component diff --git a/src/components/table/tbody.js b/src/components/table/tbody.js index f42fc613064..5e6702742e0 100644 --- a/src/components/table/tbody.js +++ b/src/components/table/tbody.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TBODY } from '../../constants/components' import { PROP_TYPE_OBJECT } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -22,7 +22,7 @@ export const props = makePropsConfigurable( // In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit // to the child elements, so this can be converted to a functional component // @vue/component -export const BTbody = /*#__PURE__*/ Vue.extend({ +export const BTbody = /*#__PURE__*/ extend({ name: NAME_TBODY, mixins: [attrsMixin, listenersMixin, normalizeSlotMixin], provide() { diff --git a/src/components/table/td.js b/src/components/table/td.js index 26c8047b5f2..d5f181f4cf2 100644 --- a/src/components/table/td.js +++ b/src/components/table/td.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TABLE_CELL } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_NUMBER_STRING, PROP_TYPE_STRING } from '../../constants/props' import { isTag } from '../../utils/dom' @@ -40,7 +40,7 @@ export const props = makePropsConfigurable( // In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit // to the child elements, so this can be converted to a functional component // @vue/component -export const BTd = /*#__PURE__*/ Vue.extend({ +export const BTd = /*#__PURE__*/ extend({ name: NAME_TABLE_CELL, // Mixin order is important! mixins: [attrsMixin, listenersMixin, normalizeSlotMixin], diff --git a/src/components/table/tfoot.js b/src/components/table/tfoot.js index 669f2474a6f..8f052c16ea3 100644 --- a/src/components/table/tfoot.js +++ b/src/components/table/tfoot.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TFOOT } from '../../constants/components' import { PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -22,7 +22,7 @@ export const props = makePropsConfigurable( // In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit // to the child elements, so this can be converted to a functional component // @vue/component -export const BTfoot = /*#__PURE__*/ Vue.extend({ +export const BTfoot = /*#__PURE__*/ extend({ name: NAME_TFOOT, mixins: [attrsMixin, listenersMixin, normalizeSlotMixin], provide() { diff --git a/src/components/table/th.js b/src/components/table/th.js index d67a799a2e7..6e8dad6a0b9 100644 --- a/src/components/table/th.js +++ b/src/components/table/th.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TH } from '../../constants/components' import { makePropsConfigurable } from '../../utils/props' import { BTd, props as BTdProps } from './td' @@ -13,7 +13,7 @@ export const props = makePropsConfigurable(BTdProps, NAME_TH) // In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit // to the child elements, so this can be converted to a functional component // @vue/component -export const BTh = /*#__PURE__*/ Vue.extend({ +export const BTh = /*#__PURE__*/ extend({ name: NAME_TH, extends: BTd, props, diff --git a/src/components/table/thead.js b/src/components/table/thead.js index 3ffd55fa308..670ddef212c 100644 --- a/src/components/table/thead.js +++ b/src/components/table/thead.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_THEAD } from '../../constants/components' import { PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -23,7 +23,7 @@ export const props = makePropsConfigurable( // In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit // to the child elements, so this can be converted to a functional component // @vue/component -export const BThead = /*#__PURE__*/ Vue.extend({ +export const BThead = /*#__PURE__*/ extend({ name: NAME_THEAD, mixins: [attrsMixin, listenersMixin, normalizeSlotMixin], provide() { diff --git a/src/components/table/tr.js b/src/components/table/tr.js index e9f0c61f7da..d9de0e29947 100644 --- a/src/components/table/tr.js +++ b/src/components/table/tr.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TR } from '../../constants/components' import { PROP_TYPE_STRING } from '../../constants/props' import { makeProp, makePropsConfigurable } from '../../utils/props' @@ -26,7 +26,7 @@ export const props = makePropsConfigurable( // In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit // to the child elements, so this can be converted to a functional component // @vue/component -export const BTr = /*#__PURE__*/ Vue.extend({ +export const BTr = /*#__PURE__*/ extend({ name: NAME_TR, mixins: [attrsMixin, listenersMixin, normalizeSlotMixin], provide() { diff --git a/src/components/tabs/tab.js b/src/components/tabs/tab.js index f75f813af59..f6bc51e9781 100644 --- a/src/components/tabs/tab.js +++ b/src/components/tabs/tab.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TAB } from '../../constants/components' import { MODEL_EVENT_NAME_PREFIX } from '../../constants/events' import { @@ -43,7 +43,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BTab = /*#__PURE__*/ Vue.extend({ +export const BTab = /*#__PURE__*/ extend({ name: NAME_TAB, mixins: [idMixin, normalizeSlotMixin], inject: { diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js index 28a4019ff8a..ced573478e4 100644 --- a/src/components/tabs/tabs.js +++ b/src/components/tabs/tabs.js @@ -1,4 +1,4 @@ -import { COMPONENT_UID_KEY, REF_FOR_KEY, Vue } from '../../vue' +import { COMPONENT_UID_KEY, REF_FOR_KEY, extend } from '../../vue' import { NAME_TABS, NAME_TAB_BUTTON_HELPER } from '../../constants/components' import { IS_BROWSER } from '../../constants/env' import { @@ -67,7 +67,7 @@ const notDisabled = tab => !tab.disabled // --- Helper components --- // @vue/component -const BVTabButton = /*#__PURE__*/ Vue.extend({ +const BVTabButton = /*#__PURE__*/ extend({ name: NAME_TAB_BUTTON_HELPER, inject: { getBvTabs: { @@ -218,7 +218,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BTabs = /*#__PURE__*/ Vue.extend({ +export const BTabs = /*#__PURE__*/ extend({ name: NAME_TABS, mixins: [idMixin, modelMixin, normalizeSlotMixin], provide() { diff --git a/src/components/time/time.js b/src/components/time/time.js index cb0c93ef2b3..be2bcd17e49 100644 --- a/src/components/time/time.js +++ b/src/components/time/time.js @@ -1,5 +1,5 @@ // BTime control (not form input control) -import { Vue, REF_FOR_KEY } from '../../vue' +import { extend, REF_FOR_KEY } from '../../vue' import { NAME_TIME } from '../../constants/components' import { EVENT_NAME_CONTEXT } from '../../constants/events' import { CODE_LEFT, CODE_RIGHT } from '../../constants/key-codes' @@ -107,7 +107,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BTime = /*#__PURE__*/ Vue.extend({ +export const BTime = /*#__PURE__*/ extend({ name: NAME_TIME, mixins: [idMixin, modelMixin, normalizeSlotMixin], props, diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js index 73ad6325bc3..25ad463a818 100644 --- a/src/components/toast/toast.js +++ b/src/components/toast/toast.js @@ -1,5 +1,5 @@ import { Portal, Wormhole } from 'portal-vue' -import { COMPONENT_UID_KEY, Vue } from '../../vue' +import { COMPONENT_UID_KEY, extend } from '../../vue' import { NAME_TOAST, NAME_TOASTER } from '../../constants/components' import { EVENT_NAME_CHANGE, @@ -86,7 +86,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BToast = /*#__PURE__*/ Vue.extend({ +export const BToast = /*#__PURE__*/ extend({ name: NAME_TOAST, mixins: [ attrsMixin, diff --git a/src/components/toast/toaster.js b/src/components/toast/toaster.js index 07a741fc9fa..f0196a81b7c 100644 --- a/src/components/toast/toaster.js +++ b/src/components/toast/toaster.js @@ -1,5 +1,5 @@ import { PortalTarget, Wormhole } from 'portal-vue' -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TOASTER } from '../../constants/components' import { EVENT_NAME_DESTROYED } from '../../constants/events' import { PROP_TYPE_STRING } from '../../constants/props' @@ -13,7 +13,7 @@ import { normalizeSlotMixin } from '../../mixins/normalize-slot' // --- Helper components --- // @vue/component -export const DefaultTransition = /*#__PURE__*/ Vue.extend({ +export const DefaultTransition = /*#__PURE__*/ extend({ mixins: [normalizeSlotMixin], data() { return { @@ -62,7 +62,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BToaster = /*#__PURE__*/ Vue.extend({ +export const BToaster = /*#__PURE__*/ extend({ name: NAME_TOASTER, mixins: [listenOnRootMixin], props, diff --git a/src/components/tooltip/helpers/bv-popper.js b/src/components/tooltip/helpers/bv-popper.js index 0d00bc2d409..ebcff40fc5e 100644 --- a/src/components/tooltip/helpers/bv-popper.js +++ b/src/components/tooltip/helpers/bv-popper.js @@ -6,7 +6,7 @@ // import Popper from 'popper.js' -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { NAME_POPPER } from '../../../constants/components' import { EVENT_NAME_HIDDEN, @@ -82,7 +82,7 @@ export const props = { // --- Main component --- // @vue/component -export const BVPopper = /*#__PURE__*/ Vue.extend({ +export const BVPopper = /*#__PURE__*/ extend({ name: NAME_POPPER, mixins: [useParentMixin], props, diff --git a/src/components/tooltip/helpers/bv-tooltip-template.js b/src/components/tooltip/helpers/bv-tooltip-template.js index 22813b7e3d2..84bae8aa2ec 100644 --- a/src/components/tooltip/helpers/bv-tooltip-template.js +++ b/src/components/tooltip/helpers/bv-tooltip-template.js @@ -1,4 +1,4 @@ -import { Vue } from '../../../vue' +import { extend } from '../../../vue' import { NAME_TOOLTIP_TEMPLATE } from '../../../constants/components' import { EVENT_NAME_FOCUSIN, @@ -24,7 +24,7 @@ export const props = { // --- Main component --- // @vue/component -export const BVTooltipTemplate = /*#__PURE__*/ Vue.extend({ +export const BVTooltipTemplate = /*#__PURE__*/ extend({ name: NAME_TOOLTIP_TEMPLATE, extends: BVPopper, mixins: [scopedStyleMixin], diff --git a/src/components/tooltip/helpers/bv-tooltip.js b/src/components/tooltip/helpers/bv-tooltip.js index 7033d7bc60b..3688229ccb5 100644 --- a/src/components/tooltip/helpers/bv-tooltip.js +++ b/src/components/tooltip/helpers/bv-tooltip.js @@ -3,7 +3,7 @@ // Handles trigger events, etc. // Instantiates template on demand -import { COMPONENT_UID_KEY, Vue } from '../../../vue' +import { COMPONENT_UID_KEY, extend } from '../../../vue' import { NAME_MODAL, NAME_TOOLTIP_HELPER } from '../../../constants/components' import { EVENT_NAME_DISABLE, @@ -140,7 +140,7 @@ const templateData = { // --- Main component --- // @vue/component -export const BVTooltip = /*#__PURE__*/ Vue.extend({ +export const BVTooltip = /*#__PURE__*/ extend({ name: NAME_TOOLTIP_HELPER, mixins: [listenOnRootMixin, useParentMixin], data() { diff --git a/src/components/tooltip/tooltip.js b/src/components/tooltip/tooltip.js index 7ea687edfdd..a0aace1b646 100644 --- a/src/components/tooltip/tooltip.js +++ b/src/components/tooltip/tooltip.js @@ -1,4 +1,4 @@ -import { Vue } from '../../vue' +import { extend } from '../../vue' import { NAME_TOOLTIP } from '../../constants/components' import { EVENT_NAME_CLOSE, @@ -83,7 +83,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BTooltip = /*#__PURE__*/ Vue.extend({ +export const BTooltip = /*#__PURE__*/ extend({ name: NAME_TOOLTIP, mixins: [normalizeSlotMixin, useParentMixin], inheritAttrs: false, diff --git a/src/components/transition/bv-transition.js b/src/components/transition/bv-transition.js index 006e848bd67..c2977391c5b 100644 --- a/src/components/transition/bv-transition.js +++ b/src/components/transition/bv-transition.js @@ -4,7 +4,7 @@ // the transition has finished the enter transition // (show and fade classes are only applied during transition) -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_TRANSITION } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_OBJECT, PROP_TYPE_STRING } from '../../constants/props' import { isPlainObject } from '../../utils/inspect' @@ -45,7 +45,7 @@ export const props = { // --- Main component --- // @vue/component -export const BVTransition = /*#__PURE__*/ Vue.extend({ +export const BVTransition = /*#__PURE__*/ extend({ name: NAME_TRANSITION, functional: true, props, diff --git a/src/components/transporter/transporter.js b/src/components/transporter/transporter.js index b3fd778b481..9f0892f6e7f 100644 --- a/src/components/transporter/transporter.js +++ b/src/components/transporter/transporter.js @@ -1,4 +1,4 @@ -import { Vue, isVue3 } from '../../vue' +import { Vue, extend, isVue3 } from '../../vue' import { NAME_TRANSPORTER, NAME_TRANSPORTER_TARGET } from '../../constants/components' import { IS_BROWSER } from '../../constants/env' import { @@ -31,7 +31,7 @@ import { createNewChildComponent } from '../../utils/create-new-child-component' // Transporter target used by BVTransporter // Supports only a single root element // @vue/component -const BVTransporterTarget = /*#__PURE__*/ Vue.extend({ +const BVTransporterTarget = /*#__PURE__*/ extend({ // As an abstract component, it doesn't appear in the $parent chain of // components, which means the next parent of any component rendered inside // of this one will be the parent from which is was portal'd @@ -79,7 +79,7 @@ export const props = { // --- Main component --- // @vue/component -const BVTransporterVue2 = /*#__PURE__*/ Vue.extend({ +const BVTransporterVue2 = /*#__PURE__*/ extend({ name: NAME_TRANSPORTER, mixins: [normalizeSlotMixin], props, @@ -178,7 +178,7 @@ const BVTransporterVue2 = /*#__PURE__*/ Vue.extend({ } }) -const BVTransporterVue3 = /*#__PURE__*/ Vue.extend({ +const BVTransporterVue3 = /*#__PURE__*/ extend({ name: NAME_TRANSPORTER, mixins: [normalizeSlotMixin], props, diff --git a/src/icons/helpers/icon-base.js b/src/icons/helpers/icon-base.js index a33ff8ac32d..7fc8e2f818c 100644 --- a/src/icons/helpers/icon-base.js +++ b/src/icons/helpers/icon-base.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { NAME_ICON_BASE } from '../../constants/components' import { PROP_TYPE_BOOLEAN, PROP_TYPE_NUMBER_STRING, PROP_TYPE_STRING } from '../../constants/props' import { identity } from '../../utils/identity' @@ -49,7 +49,7 @@ export const props = { // Shared private base component to reduce bundle/runtime size // @vue/component -export const BVIconBase = /*#__PURE__*/ Vue.extend({ +export const BVIconBase = /*#__PURE__*/ extend({ name: NAME_ICON_BASE, functional: true, props, diff --git a/src/icons/helpers/make-icon.js b/src/icons/helpers/make-icon.js index 48c76020b0b..30765a7e438 100644 --- a/src/icons/helpers/make-icon.js +++ b/src/icons/helpers/make-icon.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../../vue' +import { extend, mergeData } from '../../vue' import { omit } from '../../utils/object' import { kebabCase, pascalCase, trim } from '../../utils/string' import { BVIconBase, props as BVIconBaseProps } from './icon-base' @@ -21,7 +21,7 @@ export const makeIcon = (name, content) => { const iconTitle = kebabName.replace(/-/g, ' ') const svgContent = trim(content || '') - return /*#__PURE__*/ Vue.extend({ + return /*#__PURE__*/ extend({ name: iconName, functional: true, props: iconProps, diff --git a/src/icons/icon.js b/src/icons/icon.js index 98959fa4781..04854a4320a 100644 --- a/src/icons/icon.js +++ b/src/icons/icon.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../vue' +import { Vue, extend, mergeData } from '../vue' import { NAME_ICON } from '../constants/components' import { PROP_TYPE_STRING } from '../constants/props' import { RX_ICON_PREFIX } from '../constants/regex' @@ -36,7 +36,7 @@ export const props = makePropsConfigurable( // Helper BIcon component // Requires the requested icon component to be installed // @vue/component -export const BIcon = /*#__PURE__*/ Vue.extend({ +export const BIcon = /*#__PURE__*/ extend({ name: NAME_ICON, functional: true, props, diff --git a/src/icons/iconstack.js b/src/icons/iconstack.js index f0411fc74a8..0a480489b8e 100644 --- a/src/icons/iconstack.js +++ b/src/icons/iconstack.js @@ -1,4 +1,4 @@ -import { Vue, mergeData } from '../vue' +import { extend, mergeData } from '../vue' import { NAME_ICONSTACK } from '../constants/components' import { omit } from '../utils/object' import { makePropsConfigurable } from '../utils/props' @@ -14,7 +14,7 @@ export const props = makePropsConfigurable( // --- Main component --- // @vue/component -export const BIconstack = /*#__PURE__*/ Vue.extend({ +export const BIconstack = /*#__PURE__*/ extend({ name: NAME_ICONSTACK, functional: true, props, diff --git a/src/mixins/attrs.js b/src/mixins/attrs.js index 80eb3818b6f..972f5a760f4 100644 --- a/src/mixins/attrs.js +++ b/src/mixins/attrs.js @@ -1,8 +1,8 @@ import { makePropCacheMixin } from '../utils/cache' -import { Vue, isVue3 } from '../vue' +import { extend, isVue3 } from '../vue' const attrsMixinVue2 = makePropCacheMixin('$attrs', 'bvAttrs') -const attrsMixinVue3 = Vue.extend({ +const attrsMixinVue3 = extend({ computed: { bvAttrs() { const bvAttrs = { ...this.$attrs } diff --git a/src/mixins/card.js b/src/mixins/card.js index f5f48b9f953..7628a5d1646 100644 --- a/src/mixins/card.js +++ b/src/mixins/card.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { NAME_CARD } from '../constants/components' import { PROP_TYPE_STRING } from '../constants/props' import { makeProp, makePropsConfigurable } from '../utils/props' @@ -18,6 +18,6 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const cardMixin = Vue.extend({ +export const cardMixin = extend({ props }) diff --git a/src/mixins/click-out.js b/src/mixins/click-out.js index ee4f98fbdf1..921dbc0fff9 100644 --- a/src/mixins/click-out.js +++ b/src/mixins/click-out.js @@ -1,10 +1,10 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { EVENT_OPTIONS_NO_CAPTURE } from '../constants/events' import { contains } from '../utils/dom' import { eventOn, eventOff } from '../utils/events' // @vue/component -export const clickOutMixin = Vue.extend({ +export const clickOutMixin = extend({ data() { return { listenForClickOut: false diff --git a/src/mixins/dropdown.js b/src/mixins/dropdown.js index 0546e4650cc..59292e198ec 100644 --- a/src/mixins/dropdown.js +++ b/src/mixins/dropdown.js @@ -1,5 +1,5 @@ import Popper from 'popper.js' -import { Vue } from '../vue' +import { extend } from '../vue' import { NAME_DROPDOWN } from '../constants/components' import { HAS_TOUCH_SUPPORT } from '../constants/env' import { @@ -88,7 +88,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const dropdownMixin = Vue.extend({ +export const dropdownMixin = extend({ mixins: [idMixin, listenOnRootMixin, clickOutMixin, focusInMixin], provide() { return { getBvDropdown: () => this } diff --git a/src/mixins/focus-in.js b/src/mixins/focus-in.js index b30cbedeeaf..855f78dbf40 100644 --- a/src/mixins/focus-in.js +++ b/src/mixins/focus-in.js @@ -1,9 +1,9 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { EVENT_OPTIONS_NO_CAPTURE } from '../constants/events' import { eventOn, eventOff } from '../utils/events' // @vue/component -export const focusInMixin = Vue.extend({ +export const focusInMixin = extend({ data() { return { listenForFocusIn: false diff --git a/src/mixins/form-control.js b/src/mixins/form-control.js index e0f2e53a147..92370cca766 100644 --- a/src/mixins/form-control.js +++ b/src/mixins/form-control.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../constants/props' import { attemptFocus, isVisible, matches, requestAF, select } from '../utils/dom' import { makeProp, makePropsConfigurable } from '../utils/props' @@ -24,7 +24,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const formControlMixin = Vue.extend({ +export const formControlMixin = extend({ props, mounted() { this.handleAutofocus() diff --git a/src/mixins/form-custom.js b/src/mixins/form-custom.js index 0d1b226c0b8..2cb33ce7b07 100644 --- a/src/mixins/form-custom.js +++ b/src/mixins/form-custom.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { PROP_TYPE_BOOLEAN } from '../constants/props' import { makeProp, makePropsConfigurable } from '../utils/props' @@ -14,7 +14,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const formCustomMixin = Vue.extend({ +export const formCustomMixin = extend({ props, computed: { custom() { diff --git a/src/mixins/form-options.js b/src/mixins/form-options.js index eacc54ed349..6b23c568699 100644 --- a/src/mixins/form-options.js +++ b/src/mixins/form-options.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { PROP_TYPE_ARRAY_OBJECT, PROP_TYPE_STRING } from '../constants/props' import { get } from '../utils/get' import { stripTags } from '../utils/html' @@ -28,7 +28,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const formOptionsMixin = Vue.extend({ +export const formOptionsMixin = extend({ props, computed: { formOptions() { diff --git a/src/mixins/form-radio-check-group.js b/src/mixins/form-radio-check-group.js index 3a0735eaabe..2ca8c03629e 100644 --- a/src/mixins/form-radio-check-group.js +++ b/src/mixins/form-radio-check-group.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { PROP_TYPE_BOOLEAN, PROP_TYPE_BOOLEAN_STRING, PROP_TYPE_STRING } from '../constants/props' import { SLOT_NAME_FIRST } from '../constants/slots' import { htmlOrText } from '../utils/html' @@ -55,7 +55,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const formRadioCheckGroupMixin = Vue.extend({ +export const formRadioCheckGroupMixin = extend({ mixins: [ idMixin, modelMixin, diff --git a/src/mixins/form-radio-check.js b/src/mixins/form-radio-check.js index f02d213ec48..c053560853f 100644 --- a/src/mixins/form-radio-check.js +++ b/src/mixins/form-radio-check.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { PROP_TYPE_ANY, PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../constants/props' import { EVENT_NAME_CHANGE } from '../constants/events' import { attemptBlur, attemptFocus } from '../utils/dom' @@ -51,7 +51,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const formRadioCheckMixin = Vue.extend({ +export const formRadioCheckMixin = extend({ mixins: [ attrsMixin, idMixin, diff --git a/src/mixins/form-selection.js b/src/mixins/form-selection.js index 894928e85c6..c41f117cd75 100644 --- a/src/mixins/form-selection.js +++ b/src/mixins/form-selection.js @@ -1,7 +1,7 @@ -import { Vue } from '../vue' +import { extend } from '../vue' // @vue/component -export const formSelectionMixin = Vue.extend({ +export const formSelectionMixin = extend({ computed: { selectionStart: { // Expose selectionStart for formatters, etc diff --git a/src/mixins/form-size.js b/src/mixins/form-size.js index e2f333f974e..b380bce453f 100644 --- a/src/mixins/form-size.js +++ b/src/mixins/form-size.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { PROP_TYPE_STRING } from '../constants/props' import { makeProp, makePropsConfigurable } from '../utils/props' @@ -14,7 +14,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const formSizeMixin = Vue.extend({ +export const formSizeMixin = extend({ props, computed: { sizeFormClass() { diff --git a/src/mixins/form-state.js b/src/mixins/form-state.js index 14c81cb08c4..b17c7609f67 100644 --- a/src/mixins/form-state.js +++ b/src/mixins/form-state.js @@ -6,7 +6,7 @@ * - false for is-invalid * - null for no contextual state */ -import { Vue } from '../vue' +import { extend } from '../vue' import { PROP_TYPE_BOOLEAN } from '../constants/props' import { isBoolean } from '../utils/inspect' import { makeProp, makePropsConfigurable } from '../utils/props' @@ -25,7 +25,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const formStateMixin = Vue.extend({ +export const formStateMixin = extend({ props, computed: { computedState() { diff --git a/src/mixins/form-text.js b/src/mixins/form-text.js index f6102689a88..cf9606da856 100644 --- a/src/mixins/form-text.js +++ b/src/mixins/form-text.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { EVENT_NAME_BLUR, EVENT_NAME_CHANGE, @@ -61,7 +61,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const formTextMixin = Vue.extend({ +export const formTextMixin = extend({ mixins: [modelMixin], props, data() { diff --git a/src/mixins/form-validity.js b/src/mixins/form-validity.js index e928a69c25b..c3676b59777 100644 --- a/src/mixins/form-validity.js +++ b/src/mixins/form-validity.js @@ -1,7 +1,7 @@ -import { Vue } from '../vue' +import { extend } from '../vue' // @vue/component -export const formValidityMixin = Vue.extend({ +export const formValidityMixin = extend({ computed: { validity: { // Expose validity property diff --git a/src/mixins/has-listener.js b/src/mixins/has-listener.js index 62184fc686f..51967ca6a83 100644 --- a/src/mixins/has-listener.js +++ b/src/mixins/has-listener.js @@ -2,11 +2,11 @@ // either via `v-on:name` (in the parent) or programmatically // via `vm.$on('name', ...)` // See: https://github.com/vuejs/vue/issues/10825 -import { isVue3, Vue } from '../vue' +import { isVue3, extend } from '../vue' import { isArray, isUndefined } from '../utils/inspect' // @vue/component -export const hasListenerMixin = Vue.extend({ +export const hasListenerMixin = extend({ methods: { hasListener(name) { if (isVue3) { diff --git a/src/mixins/id.js b/src/mixins/id.js index 2e5afe7bc0c..2e7e328a18d 100644 --- a/src/mixins/id.js +++ b/src/mixins/id.js @@ -1,7 +1,7 @@ // SSR safe client-side ID attribute generation // ID's can only be generated client-side, after mount // `this._uid` is not synched between server and client -import { COMPONENT_UID_KEY, Vue } from '../vue' +import { COMPONENT_UID_KEY, extend } from '../vue' import { PROP_TYPE_STRING } from '../constants/props' import { makeProp } from '../utils/props' @@ -14,7 +14,7 @@ export const props = { // --- Mixin --- // @vue/component -export const idMixin = Vue.extend({ +export const idMixin = extend({ props, data() { return { diff --git a/src/mixins/listen-on-document.js b/src/mixins/listen-on-document.js index 25c9a04fca8..82841b74934 100644 --- a/src/mixins/listen-on-document.js +++ b/src/mixins/listen-on-document.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { IS_BROWSER } from '../constants/env' import { EVENT_OPTIONS_NO_CAPTURE } from '../constants/events' import { arrayIncludes } from '../utils/array' @@ -12,7 +12,7 @@ const PROP = '$_documentListeners' // --- Mixin --- // @vue/component -export const listenOnDocumentMixin = Vue.extend({ +export const listenOnDocumentMixin = extend({ created() { // Define non-reactive property // Object of arrays, keyed by event name, diff --git a/src/mixins/listen-on-root.js b/src/mixins/listen-on-root.js index 5d8fb95f764..53c28d86e1d 100644 --- a/src/mixins/listen-on-root.js +++ b/src/mixins/listen-on-root.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { arrayIncludes } from '../utils/array' import { keys } from '../utils/object' import { getEventRoot } from '../utils/get-event-root' @@ -9,7 +9,7 @@ const PROP = '$_rootListeners' // --- Mixin --- // @vue/component -export const listenOnRootMixin = Vue.extend({ +export const listenOnRootMixin = extend({ computed: { bvEventRoot() { return getEventRoot(this) diff --git a/src/mixins/listen-on-window.js b/src/mixins/listen-on-window.js index 644ee8a177b..39211f4613b 100644 --- a/src/mixins/listen-on-window.js +++ b/src/mixins/listen-on-window.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { IS_BROWSER } from '../constants/env' import { EVENT_OPTIONS_NO_CAPTURE } from '../constants/events' import { arrayIncludes } from '../utils/array' @@ -12,7 +12,7 @@ const PROP = '$_windowListeners' // --- Mixin --- // @vue/component -export const listenOnWindowMixin = Vue.extend({ +export const listenOnWindowMixin = extend({ created() { // Define non-reactive property // Object of arrays, keyed by event name, diff --git a/src/mixins/listeners.js b/src/mixins/listeners.js index dbe828f898c..846760a98dc 100644 --- a/src/mixins/listeners.js +++ b/src/mixins/listeners.js @@ -1,9 +1,9 @@ import { makePropCacheMixin } from '../utils/cache' -import { Vue, isVue3 } from '../vue' +import { extend, isVue3 } from '../vue' const listenersMixinVue2 = makePropCacheMixin('$listeners', 'bvListeners') -const listenersMixinVue3 = Vue.extend({ +const listenersMixinVue3 = extend({ data() { return { bvListeners: {} diff --git a/src/mixins/normalize-slot.js b/src/mixins/normalize-slot.js index 91662658098..386ec3f9ef2 100644 --- a/src/mixins/normalize-slot.js +++ b/src/mixins/normalize-slot.js @@ -1,10 +1,10 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { SLOT_NAME_DEFAULT } from '../constants/slots' import { hasNormalizedSlot, normalizeSlot } from '../utils/normalize-slot' import { concat } from '../utils/array' // @vue/component -export const normalizeSlotMixin = Vue.extend({ +export const normalizeSlotMixin = extend({ methods: { // Returns `true` if the either a `$scopedSlot` or `$slot` exists with the specified name // `name` can be a string name or an array of names diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js index cb2dcbf64ba..15c540d177b 100644 --- a/src/mixins/pagination.js +++ b/src/mixins/pagination.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { NAME_PAGINATION } from '../constants/components' import { CODE_DOWN, CODE_LEFT, CODE_RIGHT, CODE_SPACE, CODE_UP } from '../constants/key-codes' import { @@ -148,7 +148,7 @@ export const props = makePropsConfigurable( // --- Mixin --- // @vue/component -export const paginationMixin = Vue.extend({ +export const paginationMixin = extend({ mixins: [modelMixin, normalizeSlotMixin], props, data() { diff --git a/src/mixins/scoped-style.js b/src/mixins/scoped-style.js index f99f5e58b2d..b59570ed4fd 100644 --- a/src/mixins/scoped-style.js +++ b/src/mixins/scoped-style.js @@ -1,9 +1,9 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { useParentMixin } from '../mixins/use-parent' import { getScopeId } from '../utils/get-scope-id' // @vue/component -export const scopedStyleMixin = Vue.extend({ +export const scopedStyleMixin = extend({ mixins: [useParentMixin], computed: { scopedStyleAttrs() { diff --git a/src/mixins/use-parent.js b/src/mixins/use-parent.js index aeb3808a85f..577bfa923d0 100644 --- a/src/mixins/use-parent.js +++ b/src/mixins/use-parent.js @@ -1,9 +1,9 @@ -import { Vue } from '../vue' +import { extend } from '../vue' // --- Mixin --- // @vue/component -export const useParentMixin = Vue.extend({ +export const useParentMixin = extend({ computed: { bvParent() { return this.$parent || (this.$root === this && this.$options.bvParent) diff --git a/src/utils/cache.js b/src/utils/cache.js index 87cc48fa3e0..51675e3c72f 100644 --- a/src/utils/cache.js +++ b/src/utils/cache.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { cloneDeep } from './clone-deep' import { looseEqual } from './loose-equal' import { hasOwnProperty, keys } from './object' @@ -26,7 +26,7 @@ export const makePropWatcher = propName => ({ }) export const makePropCacheMixin = (propName, proxyPropName) => - Vue.extend({ + extend({ data() { return { [proxyPropName]: cloneDeep(this[propName]) } }, diff --git a/src/utils/model.js b/src/utils/model.js index 0a48c316a94..7b857c732e0 100644 --- a/src/utils/model.js +++ b/src/utils/model.js @@ -1,4 +1,4 @@ -import { Vue } from '../vue' +import { extend } from '../vue' import { EVENT_NAME_INPUT } from '../constants/events' import { PROP_TYPE_ANY } from '../constants/props' import { makeProp } from './props' @@ -17,7 +17,7 @@ export const makeModelMixin = ( } // @vue/component - const mixin = Vue.extend({ + const mixin = extend({ model: { prop, event diff --git a/src/vue.js b/src/vue.js index ae4bff7c7c3..fe15c52bf42 100644 --- a/src/vue.js +++ b/src/vue.js @@ -25,6 +25,8 @@ const ALLOWED_FIELDS_IN_DATA = [ 'refInFor' ] +let extend = Vue.extend.bind(Vue) + if (isVue3) { const { extend: originalExtend } = Vue const KNOWN_COMPONENTS = ['router-link', 'transition'] @@ -44,7 +46,7 @@ if (isVue3) { el._assign = () => {} } } - Vue.extend = function(definition) { + extend = function patchedBootstrapVueExtend(definition) { if (typeof definition === 'object' && definition.render && !definition.__alreadyPatched) { const originalRender = definition.render definition.__alreadyPatched = true @@ -116,9 +118,9 @@ if (isVue3) { } } return originalExtend.call(this, definition) - } + }.bind(Vue) } const nextTick = Vue.nextTick -export { COMPONENT_UID_KEY, Vue, mergeData, isVue3, nextTick } +export { COMPONENT_UID_KEY, Vue, mergeData, isVue3, nextTick, extend } From 56cdff4233ff80aaf203a65d935b96268d88605c Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Thu, 6 Oct 2022 17:45:31 +0300 Subject: [PATCH 063/131] chore(form-radio): remove useless watcher --- src/components/form-radio/form-radio.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/components/form-radio/form-radio.js b/src/components/form-radio/form-radio.js index f6565751c85..a040cf5529a 100644 --- a/src/components/form-radio/form-radio.js +++ b/src/components/form-radio/form-radio.js @@ -29,12 +29,5 @@ export const BFormRadio = /*#__PURE__*/ extend({ bvGroup() { return this.getBvGroup() } - }, - watch: { - computedLocalChecked(newValue, oldValue) { - if (!looseEqual(newValue, oldValue)) { - this.$emit(MODEL_EVENT_NAME, newValue) - } - } } }) From 975e4de022f2eec136d366758d0818066d12f1ab Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Wed, 12 Oct 2022 22:57:55 +0300 Subject: [PATCH 064/131] chore(ci): update prepare scripts --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d603c00d1cf..a494ebcd0c7 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "docs-gen": "cross-env NODE_ENV=docs nuxt generate -c docs/nuxt.config.js", "lint": "eslint --ext .js,.md,.vue ./", "postinstall": "opencollective || exit 0", - "prepare": "husky install", + "prepare": "husky install && yarn run build", "prettify": "prettier --write '**/*.{js,json,md,scss,ts,vue}'", "release": "yarn run prettify && yarn run test && yarn run build && yarn run release-notes && standard-version", "release-notes": "jiti ./scripts/release-notes", From d9cd8601ab562c13619b0e08af1acbf92c5abf1d Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Sat, 15 Oct 2022 22:14:31 +0300 Subject: [PATCH 065/131] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a494ebcd0c7..a3cc8499a39 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue", - "version": "2.22.0", + "version": "2.23.0", "description": "With more than 85 components, over 45 available plugins, several directives, and 1000+ icons, BootstrapVue provides one of the most comprehensive implementations of the Bootstrap v4 component and grid system available for Vue.js v2.6, complete with extensive and automated WAI-ARIA accessibility markup.", "main": "./dist/bootstrap-vue.common.js", "web": "./dist/bootstrap-vue.js", From 7462a497915818795bd056a2f64fcf82e41ff783 Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Mon, 24 Oct 2022 15:12:13 +0300 Subject: [PATCH 066/131] chore: bump @vue/test-utils version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a3cc8499a39..01d925e89f6 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "@vue/compat": "^3.2.40", "@vue/compiler-dom": "^3.2.40", "@vue/test-utils": "^1.3.0", - "@vue/test-utils-vue3": "npm:@vue/test-utils@2.1.0", + "@vue/test-utils-vue3": "npm:@vue/test-utils@2.2.0", "autoprefixer": "^10.4.0", "babel-core": "^7.0.0-bridge.0", "babel-eslint": "^10.1.0", diff --git a/yarn.lock b/yarn.lock index 20b8a8e9183..5182e828749 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2807,10 +2807,10 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.40.tgz#e57799da2a930b975321981fcee3d1e90ed257ae" integrity sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ== -"@vue/test-utils-vue3@npm:@vue/test-utils@2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.1.0.tgz#c2f646aa2d6ac779f79a83f18c5b82fc40952bfd" - integrity sha512-U4AxAD/tKJ3ajxYew1gkfEotpr96DE/gLXpbl+nPbsNRqGBfQZZA7YhwGoQNDPgon56v+IGZDrYq7pe3GDl9aw== +"@vue/test-utils-vue3@npm:@vue/test-utils@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.2.0.tgz#3d8fc020802db9b726e2d91b6e3fb5b21aa0bf0c" + integrity sha512-EKp5/N7ieNZdoLTkD16j/irUjIEDN63QUIc41vLUMqGvSsTQN0QxbFiQqh5v49RPfS5vZH+DhjNUEkijCMOCSg== "@vue/test-utils@^1.3.0": version "1.3.0" From b69b4c5ad8c39780fb2eca4c7b63e11b0d80559e Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Mon, 24 Oct 2022 23:00:09 +0300 Subject: [PATCH 067/131] chore(vue3): use vue-test-utils-compat v0.0.6 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 01d925e89f6..a1fcd547bec 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "vue-router": "^3.5.1", "vue-server-renderer": "^2.6.12", "vue-template-compiler": "^2.6.12", - "vue-test-utils-compat": "0.0.3" + "vue-test-utils-compat": "0.0.6" }, "keywords": [ "Bootstrap", diff --git a/yarn.lock b/yarn.lock index 5182e828749..9ffe8e662d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14876,10 +14876,10 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue-test-utils-compat@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/vue-test-utils-compat/-/vue-test-utils-compat-0.0.3.tgz#d3efb08b049e97fc4577bdb1a93e417f546c2651" - integrity sha512-2zFkkcoirkp2FTrO7y2y4fZ9ZJ3WaoPoxwAZ7MmptlUhLchxbcay1KJ8t9qdJS1PHnu6aF98mD0Dn0jMQGoDGQ== +vue-test-utils-compat@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/vue-test-utils-compat/-/vue-test-utils-compat-0.0.6.tgz#3600c63dc8175167641f7af170918e59354e6a79" + integrity sha512-yr/PpRQeJU0xkV7d0OVThE+YeY6FgsB8+Bj9X7Z3vY6PUFthDXNfOJPHx2JIPO4l1TQ0kZ7mlOVQmDduLiBP1Q== vue@^2.6.12: version "2.6.12" From b4424713dc7f0719a7c3a74a2d39ef26593e206f Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Mon, 24 Oct 2022 23:10:01 +0300 Subject: [PATCH 068/131] chore: remove unused vars --- src/components/form-radio/form-radio.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/components/form-radio/form-radio.js b/src/components/form-radio/form-radio.js index a040cf5529a..02b75dd9d10 100644 --- a/src/components/form-radio/form-radio.js +++ b/src/components/form-radio/form-radio.js @@ -1,12 +1,7 @@ import { extend } from '../../vue' import { NAME_FORM_RADIO } from '../../constants/components' -import { looseEqual } from '../../utils/loose-equal' import { makePropsConfigurable } from '../../utils/props' -import { - MODEL_EVENT_NAME, - formRadioCheckMixin, - props as formRadioCheckProps -} from '../../mixins/form-radio-check' +import { formRadioCheckMixin, props as formRadioCheckProps } from '../../mixins/form-radio-check' // --- Props --- From 6ef2ba4cc161125a703c8953975bd68020ab3807 Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Tue, 25 Oct 2022 00:08:38 +0300 Subject: [PATCH 069/131] chore: ignore vue3-specific code --- src/utils/element-to-vue-instance-registry.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/element-to-vue-instance-registry.js b/src/utils/element-to-vue-instance-registry.js index a07c7f35598..b6956de09c2 100644 --- a/src/utils/element-to-vue-instance-registry.js +++ b/src/utils/element-to-vue-instance-registry.js @@ -30,6 +30,7 @@ export const getInstanceFromElement = element => { while (currentElement) { if (registry.has(currentElement)) { + /* istanbul ignore next */ return registry.get(currentElement) } currentElement = currentElement.parentNode From 440462cda2c7c8d3c5928cc06a2b3e62d759bdc8 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 14 Oct 2022 17:22:50 +0300 Subject: [PATCH 070/131] Fix b-time hydration error Since AM\PM spinner depends on client's setting it shouldn't be rendered on server. --- src/components/time/time.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/time/time.js b/src/components/time/time.js index be2bcd17e49..ff89e1854a1 100644 --- a/src/components/time/time.js +++ b/src/components/time/time.js @@ -504,7 +504,8 @@ export const BTime = /*#__PURE__*/ extend({ } // AM/PM ? - if (this.is12Hour) { + // depends on client settings, shouldn't be rendered on server + if (this.isLive && this.is12Hour) { // TODO: // If locale is RTL, unshift this instead of push? // And switch class `ml-2` to `mr-2` From 8070787000e4c0d0cafcfd34b2d44cdeb87043e6 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Tue, 18 Oct 2022 23:41:48 +0300 Subject: [PATCH 071/131] Add transition-group to known components This change ensures props are properly passed to `transition-group` component in compat mode. --- src/vue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vue.js b/src/vue.js index fe15c52bf42..8bb10cf7c2e 100644 --- a/src/vue.js +++ b/src/vue.js @@ -29,7 +29,7 @@ let extend = Vue.extend.bind(Vue) if (isVue3) { const { extend: originalExtend } = Vue - const KNOWN_COMPONENTS = ['router-link', 'transition'] + const KNOWN_COMPONENTS = ['router-link', 'transition', 'transition-group'] const originalVModelDynamicCreated = Vue.vModelDynamic.created const originalVModelDynamicBeforeUpdate = Vue.vModelDynamic.beforeUpdate From f9956d619c25ce07993f114e711ba4470795752b Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Tue, 25 Oct 2022 15:12:03 +0300 Subject: [PATCH 072/131] docs: add vue3 related info --- docs/components/header.vue | 1 + docs/markdown/intro/README.md | 4 +- docs/pages/index.vue | 1 - docs/pages/vue3.vue | 77 +++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 docs/pages/vue3.vue diff --git a/docs/components/header.vue b/docs/components/header.vue index 6e00bf5eeaa..6c6b5e97f74 100644 --- a/docs/components/header.vue +++ b/docs/components/header.vue @@ -31,6 +31,7 @@

Docs + Vue.js 3

Components

Directives

Icons diff --git a/docs/markdown/intro/README.md b/docs/markdown/intro/README.md index 1d496555b66..1a82f220734 100644 --- a/docs/markdown/intro/README.md +++ b/docs/markdown/intro/README.md @@ -44,8 +44,8 @@ v{{ bootstrapVersionMajor }} CSS. Good starting points for these: In many of the examples shown in BootstrapVue's documentation, you may see the use of CSS classes such as ml-2, py-1, etc. These are -Bootstrap v{{bootstrapVersionMinor}} utility classes that help control padding, margins, positioning, -and more. You can find information on these classes in the +Bootstrap v{{bootstrapVersionMinor}} utility classes that help control padding, margins, +positioning, and more. You can find information on these classes in the [Utility Classes](/docs/reference/utility-classes) reference section. Many of the examples in this documentation are _live_ and can be edited in-place for an enhanced diff --git a/docs/pages/index.vue b/docs/pages/index.vue index 478a8715e1d..7b0699c0188 100644 --- a/docs/pages/index.vue +++ b/docs/pages/index.vue @@ -7,7 +7,6 @@ -

BootstrapVue diff --git a/docs/pages/vue3.vue b/docs/pages/vue3.vue new file mode 100644 index 00000000000..058c2fdeced --- /dev/null +++ b/docs/pages/vue3.vue @@ -0,0 +1,77 @@ + + + From 54584ee61632bc17adf69b82602978041047bcf0 Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Tue, 25 Oct 2022 15:26:16 +0300 Subject: [PATCH 073/131] chore(release): v2.23.0 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f10b66b77..50b9863c36c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.23.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.22.0...v2.24.0) (2022-10-25) + +### Bug Fixes + +- **vue3:** do not rely on \_\_vueParentComponent in tooltip + ([fe13503](https://github.com/bootstrap-vue/bootstrap-vue/commit/fe13503f7aa6d0bd6f7e1ed4f4a2e7acff421106)) +- update refs inside v-for to work for @vue/compat + ([ae4bac8](https://github.com/bootstrap-vue/bootstrap-vue/commit/ae4bac8a4327a1f293afbcf571e84ed1de4497f8)) + +### Other v2.23.0 + +- add support for @vue/compat + ## [2.22.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.21.2...v2.22.0) (2022-04-17) ### Features From 58e2d7e4f5e883207c4f7baa856532d3ae924a0c Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Wed, 26 Oct 2022 03:35:54 +0300 Subject: [PATCH 074/131] fix(util): retain parent-child relationship for Vue 2 --- .../transporter/transporter.spec.js | 24 +++++++++++++++++++ src/utils/create-new-child-component.js | 1 + 2 files changed, 25 insertions(+) diff --git a/src/components/transporter/transporter.spec.js b/src/components/transporter/transporter.spec.js index dca24b996e4..417282639de 100644 --- a/src/components/transporter/transporter.spec.js +++ b/src/components/transporter/transporter.spec.js @@ -58,4 +58,28 @@ describe('utils/transporter component', () => { expect(target.parentElement).toEqual(null) }) + + it('maintains provide-inject relation', async () => { + const Child = { + inject: ['foo'], + render(h) { + return h('article', this.foo) + } + } + + const App = { + provide() { + return { foo: 'foo' } + }, + render(h) { + return h(BVTransporter, { props: { disabled: false } }, [h(Child)]) + } + } + + mount(App, { + attachTo: document.body + }) + + expect(document.querySelector('article').textContent).toBe('foo') + }) }) diff --git a/src/utils/create-new-child-component.js b/src/utils/create-new-child-component.js index 64b97e26191..78dbb2f37f8 100644 --- a/src/utils/create-new-child-component.js +++ b/src/utils/create-new-child-component.js @@ -3,6 +3,7 @@ export const createNewChildComponent = (parent, Component, config = {}) => { return new Component({ ...config, + parent, bvParent: parent, bvEventRoot }) From a1cebda1ef6e9579e742fdf3937a28643c8e31ec Mon Sep 17 00:00:00 2001 From: Illya Klymov Date: Wed, 26 Oct 2022 04:09:59 +0300 Subject: [PATCH 075/131] chore(release): v2.23.1 --- CHANGELOG.md | 9 ++++++++- package.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50b9863c36c..b65ab2cefe1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -## [2.23.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.22.0...v2.24.0) (2022-10-25) +## [2.23.1](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.23.0...v2.23.1) (2022-10-26) + +### Bug Fixes + +- correctly pass parent relations for Vue.js2 + ([58e2d7e](https://github.com/bootstrap-vue/bootstrap-vue/commit/58e2d7e4f5e883207c4f7baa856532d3ae924a0c)) + +## [2.23.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.22.0...v2.23.0) (2022-10-25) ### Bug Fixes diff --git a/package.json b/package.json index a1fcd547bec..15e34dc19d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue", - "version": "2.23.0", + "version": "2.23.1", "description": "With more than 85 components, over 45 available plugins, several directives, and 1000+ icons, BootstrapVue provides one of the most comprehensive implementations of the Bootstrap v4 component and grid system available for Vue.js v2.6, complete with extensive and automated WAI-ARIA accessibility markup.", "main": "./dist/bootstrap-vue.common.js", "web": "./dist/bootstrap-vue.js", From b22746dee0fd1382ed136c1a2ed8d9a0dd60872c Mon Sep 17 00:00:00 2001 From: David Eisner Date: Mon, 31 Oct 2022 16:21:19 -0400 Subject: [PATCH 076/131] Fix typo in table component's README.md --- src/components/table/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/table/README.md b/src/components/table/README.md index b2ad455df73..f158bb9a41a 100644 --- a/src/components/table/README.md +++ b/src/components/table/README.md @@ -1053,7 +1053,7 @@ formatted value as a string (HTML strings are not supported) ## Header and Footer custom rendering via scoped slots -It is also possible to provide custom rendering for the tables `thead` and `tfoot` elements. Note by +It is also possible to provide custom rendering for the table's `thead` and `tfoot` elements. Note by default the table footer is not rendered unless `foot-clone` is set to `true`. Scoped slots for the header and footer cells uses a special naming convention of From 4bd9f038160cd31451ecfbcd56d0a4c462e8ed9a Mon Sep 17 00:00:00 2001 From: Issayah Date: Tue, 13 Dec 2022 17:51:58 -0600 Subject: [PATCH 077/131] Update src/components/modal/README.md --- src/components/modal/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modal/README.md b/src/components/modal/README.md index 7b2c283200a..94e7f62846c 100644 --- a/src/components/modal/README.md +++ b/src/components/modal/README.md @@ -317,7 +317,7 @@ To prevent `` from closing (for example when validation fails). you can ``` -##Events +## Events The events `ok`, `cancel`, and `close` are emitted by modal's built in **OK**, **Cancel**, and header close (**X**) buttons respectively. These events will not be emitted, by default, if you have From d2e7289a39e6e270282c7482ae685700765bbe69 Mon Sep 17 00:00:00 2001 From: Issayah Date: Tue, 13 Dec 2022 17:54:38 -0600 Subject: [PATCH 078/131] Update src/components/modal/README.md --- src/components/modal/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modal/README.md b/src/components/modal/README.md index 94e7f62846c..63d1e500068 100644 --- a/src/components/modal/README.md +++ b/src/components/modal/README.md @@ -317,7 +317,7 @@ To prevent `` from closing (for example when validation fails). you can ``` -## Events +### Events The events `ok`, `cancel`, and `close` are emitted by modal's built in **OK**, **Cancel**, and header close (**X**) buttons respectively. These events will not be emitted, by default, if you have From 569bfb0819722bd5f1d9bcb27f61a0cdd2ea5c43 Mon Sep 17 00:00:00 2001 From: Issayah Date: Tue, 13 Dec 2022 17:57:41 -0600 Subject: [PATCH 079/131] Update src/components/modal/README.md --- src/components/modal/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modal/README.md b/src/components/modal/README.md index 63d1e500068..94e7f62846c 100644 --- a/src/components/modal/README.md +++ b/src/components/modal/README.md @@ -317,7 +317,7 @@ To prevent `` from closing (for example when validation fails). you can ``` -### Events +## Events The events `ok`, `cancel`, and `close` are emitted by modal's built in **OK**, **Cancel**, and header close (**X**) buttons respectively. These events will not be emitted, by default, if you have From 05c6f74b0ac7bdc594b45100c5abb13ad40dd42f Mon Sep 17 00:00:00 2001 From: Sensational Code Date: Fri, 6 Jan 2023 11:49:26 -0800 Subject: [PATCH 080/131] Fix headerTag docs description incorrectly referring to footer --- src/components/calendar/package.json | 2 +- src/components/modal/package.json | 2 +- src/components/sidebar/package.json | 2 +- src/components/time/package.json | 2 +- src/components/toast/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/calendar/package.json b/src/components/calendar/package.json index 60e7f43da44..d32228b80b9 100644 --- a/src/components/calendar/package.json +++ b/src/components/calendar/package.json @@ -39,7 +39,7 @@ { "prop": "headerTag", "version": "2.22.0", - "description": "Specify the HTML tag to render instead of the default tag for the footer" + "description": "Specify the HTML tag to render instead of the default tag for the header" }, { "prop": "hidden", diff --git a/src/components/modal/package.json b/src/components/modal/package.json index 28c2c692dc2..ad68026f38b 100644 --- a/src/components/modal/package.json +++ b/src/components/modal/package.json @@ -141,7 +141,7 @@ { "prop": "headerTag", "version": "2.22.0", - "description": "Specify the HTML tag to render instead of the default tag for the footer" + "description": "Specify the HTML tag to render instead of the default tag for the header" }, { "prop": "hideBackdrop", diff --git a/src/components/sidebar/package.json b/src/components/sidebar/package.json index f083bd74f45..1b4b172854f 100644 --- a/src/components/sidebar/package.json +++ b/src/components/sidebar/package.json @@ -51,7 +51,7 @@ { "prop": "headerTag", "version": "2.22.0", - "description": "Specify the HTML tag to render instead of the default tag for the footer" + "description": "Specify the HTML tag to render instead of the default tag for the header" }, { "prop": "lazy", diff --git a/src/components/time/package.json b/src/components/time/package.json index 2b8521f7373..d843d30dfe8 100644 --- a/src/components/time/package.json +++ b/src/components/time/package.json @@ -18,7 +18,7 @@ { "prop": "headerTag", "version": "2.22.0", - "description": "Specify the HTML tag to render instead of the default tag for the footer" + "description": "Specify the HTML tag to render instead of the default tag for the header" }, { "prop": "hideHeader", diff --git a/src/components/toast/package.json b/src/components/toast/package.json index fe943ffefac..cb0cb8ed7d4 100644 --- a/src/components/toast/package.json +++ b/src/components/toast/package.json @@ -31,7 +31,7 @@ { "prop": "headerTag", "version": "2.22.0", - "description": "Specify the HTML tag to render instead of the default tag for the footer" + "description": "Specify the HTML tag to render instead of the default tag for the header" }, { "prop": "isStatus", From a0b93ac7f0b86f8217662aaa98257970c8f29358 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Jan 2023 20:03:29 +0000 Subject: [PATCH 081/131] chore(deps): bump actions/cache from 3.0.11 to 3.2.2 Bumps [actions/cache](https://github.com/actions/cache) from 3.0.11 to 3.2.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.0.11...v3.2.2) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bfcb71d9e51..eb275296cbd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache node_modules - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.2 with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4185f1c5f1e..e6cc3d70618 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache node_modules - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.2 with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }} @@ -73,7 +73,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache node_modules - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.2 with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }} @@ -110,7 +110,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache node_modules - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.2 with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }} From f4d7184d8d85ac12d69ee17c6f55a65d0f334a30 Mon Sep 17 00:00:00 2001 From: Issayah Date: Sun, 8 Jan 2023 10:31:53 -0600 Subject: [PATCH 082/131] docs: update CODE_OF_CONDUCT to v2.1 --- CODE_OF_CONDUCT.md | 158 ++++++++++++++++++++++++++++++++------------- 1 file changed, 113 insertions(+), 45 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index fb779a4ee99..fb0aab45fea 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,65 +1,133 @@ # Contributor Covenant Code of Conduct -## Our pledge +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, caste, color, religion, or sexual +identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the overall + community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or advances of + any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email address, + without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. -In the interest of fostering an open and welcoming environment, we as contributors and maintainers -pledge to making participation in our project and our community a harassment-free experience for -everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level -of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. +## Scope -## Our standards +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. -Examples of behavior that contributes to creating a positive environment include: +## Enforcement -- Using welcoming and inclusive language -- Being respectful of differing viewpoints and experiences -- Gracefully accepting constructive criticism -- Focusing on what is best for the community -- Showing empathy towards other community members +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting +the project team at pooya@pi0.ir. The project team will review and investigate all complaints, and +will respond in a way that it deems appropriate to the circumstances. The project team is obligated +to maintain confidentiality with regard to the reporter of an incident. Further details of specific +enforcement policies may be posted separately. -Examples of unacceptable behavior by participants include: +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. -- The use of sexualized language or imagery and unwelcome sexual attention or advances -- Trolling, insulting/derogatory comments, and personal or political attacks -- Public or private harassment -- Publishing others' private information, such as a physical or electronic address, without explicit - permission -- Other conduct which could reasonably be considered inappropriate in a professional setting +## Enforcement Guidelines -## Our responsibilities +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: -Project maintainers are responsible for clarifying the standards of acceptable behavior and are -expected to take appropriate and fair corrective action in response to any instances of unacceptable -behavior. +### 1. Correction -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, -code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or -to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. -## Scope +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. -This Code of Conduct applies both within project spaces and in public spaces when an individual is -representing the project or its community. Examples of representing a project or community include -using an official project e-mail address, posting via an official social media account, or acting as -an appointed representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. +### 2. Warning -## Enforcement +**Community Impact**: A violation through a single incident or series of +actions. -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting -the project team at pooya@pi0.ir. The project team will review and investigate all complaints, and -will respond in a way that it deems appropriate to the circumstances. The project team is obligated -to maintain confidentiality with regard to the reporter of an incident. Further details of specific -enforcement policies may be posted separately. +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or permanent +ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face -temporary or permanent repercussions as determined by other members of the project's leadership. +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the +community. ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at -[https://contributor-covenant.org/version/1/4][version] +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.1, available at +[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at +[https://www.contributor-covenant.org/translations][translations]. -[homepage]: https://contributor-covenant.org -[version]: https://contributor-covenant.org/version/1/4/ +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations From a8a5d4efa340fe8ebdbf3a247e716e8ce3a4c2f1 Mon Sep 17 00:00:00 2001 From: Issayah Date: Sun, 8 Jan 2023 10:38:27 -0600 Subject: [PATCH 083/131] chore: update copyright year to 2023 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 80d672f72fb..dd006055d49 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2020 - BootstrapVue +Copyright (c) 2016-2023 - BootstrapVue Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From fa65e58f0dfe03f0d24f81069ed7f0ab8ee6f0d2 Mon Sep 17 00:00:00 2001 From: Renan Sugiyama Date: Sun, 7 May 2023 15:31:33 -0300 Subject: [PATCH 084/131] chore(docs): fix event name to hide a specific tooltip --- src/directives/tooltip/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/directives/tooltip/README.md b/src/directives/tooltip/README.md index 334372c9405..2c5b948b6a5 100644 --- a/src/directives/tooltip/README.md +++ b/src/directives/tooltip/README.md @@ -463,7 +463,7 @@ To close a **specific tooltip**, pass the trigger element's `id`, or the `id` of was provided in the config object) as the first argument: ```js -this.$root.$emit('bv::show::tooltip', 'my-trigger-button-id') +this.$root.$emit('bv::hide::tooltip', 'my-trigger-button-id') ``` To open a **specific tooltip**, pass the trigger element's `id`, or the `id` of the tooltip (if one From 2d597895ba8174ff72f87ec159c7e32658de1683 Mon Sep 17 00:00:00 2001 From: Issayah Date: Thu, 27 Jul 2023 19:17:43 -0500 Subject: [PATCH 085/131] Update vue3.vue --- docs/pages/vue3.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/vue3.vue b/docs/pages/vue3.vue index 058c2fdeced..99e14850f95 100644 --- a/docs/pages/vue3.vue +++ b/docs/pages/vue3.vue @@ -10,7 +10,7 @@ With the release of v2.23.0 you can now use BootstrapVue with migration build of Vue.js 3 - @vue/compat support is designed for early migration to Vue.js 3 and will be eventually replaced with bootstrap-vue 3.0 + @vue/compat support is designed for early migration to Vue.js 3 and will be eventually replaced with BootstrapVueNext. BootstrapVueNext is currently in Alpha

Important limitations From 900ebb5192bb96a3b257196e58f88dc67747aa07 Mon Sep 17 00:00:00 2001 From: Issayah Date: Thu, 27 Jul 2023 19:23:54 -0500 Subject: [PATCH 086/131] Update docs/pages/vue3.vue --- docs/pages/vue3.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/vue3.vue b/docs/pages/vue3.vue index 99e14850f95..d43c93e1c3f 100644 --- a/docs/pages/vue3.vue +++ b/docs/pages/vue3.vue @@ -10,7 +10,7 @@ With the release of v2.23.0 you can now use BootstrapVue with migration build of Vue.js 3 - @vue/compat support is designed for early migration to Vue.js 3 and will be eventually replaced with BootstrapVueNext. BootstrapVueNext is currently in Alpha + @vue/compat support is designed for early migration to Vue.js 3 and will be eventually replaced with BootstrapVueNext. BootstrapVueNext is currently in Alpha

Important limitations From 9177189cb26f7a46c41d455192901f7b565ac599 Mon Sep 17 00:00:00 2001 From: Mika Steyer <108517592+steyer-mika@users.noreply.github.com> Date: Mon, 14 Oct 2024 22:33:24 +0200 Subject: [PATCH 087/131] chore: update copyright year to 2023 (#7203) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index dd006055d49..1ebf42caf8b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2023 - BootstrapVue +Copyright (c) 2016-2024 - BootstrapVue Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From ef391f5327efdd289c52b3387d2b11892bf4e2c1 Mon Sep 17 00:00:00 2001 From: Issayah Date: Mon, 14 Oct 2024 15:33:43 -0500 Subject: [PATCH 088/131] docs: bootstrap-vue-next recommendation (#7219) --- docs/pages/vue3.vue | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/docs/pages/vue3.vue b/docs/pages/vue3.vue index d43c93e1c3f..1894910a042 100644 --- a/docs/pages/vue3.vue +++ b/docs/pages/vue3.vue @@ -1,39 +1,37 @@

Vue.js 3.x initial support

+ Important limitations +

+ Getting started +

Vue.js 3.x initial support

Transitioning to Vue.js 3.x

- Important limitations + Important Limitations

- Getting started + Getting Started

Partners

Themes

Custom themes and dashboards

Coming soon!

{{ theme.title }}