@gitlab/ui 132.0.1 → 132.0.3

package/src/vendor/bootstrap-vue/src/components/dropdown/dropdown-header.js

@@ -3,14 +3,25 @@ import { NAME_DROPDOWN_HEADER } from '../../constants/components'
 import { PROP_TYPE_STRING } from '../../constants/props'
 import { isTag } from '../../utils/dom'
 import { omit } from '../../utils/object'
-import { makeProp } from '../../utils/props'
 
 // --- Props ---
 
 export const props = {
-  id: makeProp(PROP_TYPE_STRING),
-  tag: makeProp(PROP_TYPE_STRING, 'header'),
-  variant: makeProp(PROP_TYPE_STRING)
+  id: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  tag: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'header'
+  },
+  variant: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  }
 }
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/dropdown/dropdown-item-button.js

@@ -2,23 +2,47 @@ import { extend } from '../../vue'
 import { NAME_DROPDOWN_ITEM_BUTTON } from '../../constants/components'
 import { EVENT_NAME_CLICK } from '../../constants/events'
 import {
-  PROP_TYPE_ARRAY_OBJECT_STRING,
+  PROP_TYPE_ARRAY,
   PROP_TYPE_BOOLEAN,
+  PROP_TYPE_OBJECT,
   PROP_TYPE_STRING
 } from '../../constants/props'
-import { makeProp } from '../../utils/props'
 import { attrsMixin } from '../../mixins/attrs'
 import { normalizeSlotMixin } from '../../mixins/normalize-slot'
 
 // --- Props ---
 
 export const props = {
-  active: makeProp(PROP_TYPE_BOOLEAN, false),
-  activeClass: makeProp(PROP_TYPE_STRING, 'active'),
-  buttonClass: makeProp(PROP_TYPE_ARRAY_OBJECT_STRING),
-  disabled: makeProp(PROP_TYPE_BOOLEAN, false),
-  variant: makeProp(PROP_TYPE_STRING),
-  role: makeProp(PROP_TYPE_STRING, 'menuitem')
+  active: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  },
+  activeClass: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'active'
+  },
+  buttonClass: {
+    type: [PROP_TYPE_ARRAY, PROP_TYPE_OBJECT, PROP_TYPE_STRING],
+    required: false,
+    default: undefined
+  },
+  disabled: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  },
+  variant: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  role: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'menuitem'
+  }
 }
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/dropdown/dropdown.js

@@ -7,7 +7,7 @@ import {
   PROP_TYPE_STRING
 } from '../../constants/props'
 import { SLOT_NAME_BUTTON_CONTENT, SLOT_NAME_DEFAULT } from '../../constants/slots'
-import { arrayIncludes } from '../../utils/array'
+
 import { htmlOrText } from '../../utils/html'
 import { toString } from '../../utils/string'
 import { dropdownMixin, props as dropdownProps } from '../../mixins/dropdown'
@@ -67,7 +67,7 @@ export const props = sortKeys({
     required: false,
     default: 'button',
     validator: value => {
-      return arrayIncludes(['button', 'submit', 'reset'], value)
+      return ['button', 'submit', 'reset'].includes(value)
     }
   },
   splitClass: {

package/src/vendor/bootstrap-vue/src/components/form/form-invalid-feedback.js

@@ -1,19 +1,46 @@
 import { extend, mergeData } from '../../vue'
 import { NAME_FORM_INVALID_FEEDBACK } from '../../constants/components'
 import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props'
-import { makeProp } from '../../utils/props'
 
 // --- Props ---
 
 export const props = {
-  ariaLive: makeProp(PROP_TYPE_STRING),
-  forceShow: makeProp(PROP_TYPE_BOOLEAN, false),
-  id: makeProp(PROP_TYPE_STRING),
-  role: makeProp(PROP_TYPE_STRING),
+  ariaLive: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  forceShow: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  },
+  id: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  role: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
   // Tri-state prop: `true`, `false`, or `null`
-  state: makeProp(PROP_TYPE_BOOLEAN, null),
-  tag: makeProp(PROP_TYPE_STRING, 'div'),
-  tooltip: makeProp(PROP_TYPE_BOOLEAN, false)
+  state: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: null
+  },
+  tag: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'div'
+  },
+  tooltip: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  }
 }
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/form/form-valid-feedback.js

@@ -1,19 +1,46 @@
 import { extend, mergeData } from '../../vue'
 import { NAME_FORM_VALID_FEEDBACK } from '../../constants/components'
 import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props'
-import { makeProp } from '../../utils/props'
 
 // --- Props ---
 
 export const props = {
-  ariaLive: makeProp(PROP_TYPE_STRING),
-  forceShow: makeProp(PROP_TYPE_BOOLEAN, false),
-  id: makeProp(PROP_TYPE_STRING),
-  role: makeProp(PROP_TYPE_STRING),
+  ariaLive: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  forceShow: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  },
+  id: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  role: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
   // Tri-state prop: `true`, `false`, or `null`
-  state: makeProp(PROP_TYPE_BOOLEAN, null),
-  tag: makeProp(PROP_TYPE_STRING, 'div'),
-  tooltip: makeProp(PROP_TYPE_BOOLEAN, false)
+  state: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: null
+  },
+  tag: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'div'
+  },
+  tooltip: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  }
 }
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/form-group/form-group.js

@@ -14,7 +14,7 @@ import {
   SLOT_NAME_LABEL,
   SLOT_NAME_VALID_FEEDBACK
 } from '../../constants/slots'
-import { arrayIncludes } from '../../utils/array'
+
 import { getBreakpointsUpCached } from '../../utils/config'
 import { cssEscape } from '../../utils/css-escape'
 import {
@@ -185,7 +185,7 @@ export const BFormGroup = {
           // and ensuring the ID's are unique
           const ids = (getAttr($input, attr) || '')
             .split(RX_SPACE_SPLIT)
-            .filter(id => !arrayIncludes(oldIds, id))
+            .filter(id => !oldIds.includes(id))
             .concat(newIds)
             .filter((id, index, ids) => ids.indexOf(id) === index)
             .filter(identity)

package/src/vendor/bootstrap-vue/src/components/form-select/form-select-option-group.js

@@ -4,7 +4,6 @@ import { PROP_TYPE_STRING } from '../../constants/props'
 import { SLOT_NAME_FIRST } from '../../constants/slots'
 import { htmlOrText } from '../../utils/html'
 import { sortKeys } from '../../utils/object'
-import { makeProp } from '../../utils/props'
 import { formOptionsMixin, props as formOptionsProps } from '../../mixins/form-options'
 import { normalizeSlotMixin } from '../../mixins/normalize-slot'
 import { BFormSelectOption } from './form-select-option'
@@ -13,7 +12,10 @@ import { BFormSelectOption } from './form-select-option'
 
 export const props = sortKeys({
   ...formOptionsProps,
-  label: makeProp(PROP_TYPE_STRING, undefined, true) // Required
+  label: {
+    type: PROP_TYPE_STRING,
+    required: true
+  }
 })
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/form-select/form-select-option.js

@@ -1,13 +1,19 @@
 import { extend, mergeData } from '../../vue'
 import { NAME_FORM_SELECT_OPTION } from '../../constants/components'
 import { PROP_TYPE_ANY, PROP_TYPE_BOOLEAN } from '../../constants/props'
-import { makeProp } from '../../utils/props'
 
 // --- Props ---
 
 export const props = {
-  disabled: makeProp(PROP_TYPE_BOOLEAN, false),
-  value: makeProp(PROP_TYPE_ANY, undefined, true) // Required
+  disabled: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  },
+  value: {
+    type: PROP_TYPE_ANY,
+    required: true
+  }
 }
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/form-select/form-select.js

@@ -1,18 +1,13 @@
 import { extend } from '../../vue'
 import { NAME_FORM_SELECT } from '../../constants/components'
 import { EVENT_NAME_CHANGE } from '../../constants/events'
-import {
-  PROP_TYPE_BOOLEAN,
-  PROP_TYPE_BOOLEAN_STRING,
-  PROP_TYPE_NUMBER
-} from '../../constants/props'
+import { PROP_TYPE_BOOLEAN, PROP_TYPE_NUMBER, PROP_TYPE_STRING } from '../../constants/props'
 import { SLOT_NAME_FIRST } from '../../constants/slots'
 import { from as arrayFrom } from '../../utils/array'
 import { attemptBlur, attemptFocus } from '../../utils/dom'
 import { htmlOrText } from '../../utils/html'
 import { isArray } from '../../utils/inspect'
 import { sortKeys } from '../../utils/object'
-import { makeProp } from '../../utils/props'
 import { formControlMixin, props as formControlProps } from '../../mixins/form-control'
 import { formCustomMixin, props as formCustomProps } from '../../mixins/form-custom'
 import { formSizeMixin, props as formSizeProps } from '../../mixins/form-size'
@@ -38,11 +33,23 @@ export const props = sortKeys({
   ...formCustomProps,
   ...formSizeProps,
   ...formStateProps,
-  ariaInvalid: makeProp(PROP_TYPE_BOOLEAN_STRING, false),
-  multiple: makeProp(PROP_TYPE_BOOLEAN, false),
+  ariaInvalid: {
+    type: [PROP_TYPE_BOOLEAN, PROP_TYPE_STRING],
+    required: false,
+    default: false
+  },
+  multiple: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  },
   // Browsers default size to `0`, which shows 4 rows in most browsers in multiple mode
   // Size of `1` can bork out Firefox
-  selectSize: makeProp(PROP_TYPE_NUMBER, 0)
+  selectSize: {
+    type: PROP_TYPE_NUMBER,
+    required: false,
+    default: 0
+  }
 })
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/form-select/helpers/mixin-options.js

@@ -3,15 +3,22 @@ import { PROP_TYPE_STRING } from '../../../constants/props'
 import { get } from '../../../utils/get'
 import { isNull, isPlainObject, isUndefined } from '../../../utils/inspect'
 import { sortKeys } from '../../../utils/object'
-import { makeProp } from '../../../utils/props'
 import { formOptionsMixin, props as formOptionsProps } from '../../../mixins/form-options'
 
 // --- Props ---
 
 export const props = sortKeys({
   ...formOptionsProps,
-  labelField: makeProp(PROP_TYPE_STRING, 'label'),
-  optionsField: makeProp(PROP_TYPE_STRING, 'options')
+  labelField: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'label'
+  },
+  optionsField: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'options'
+  }
 })
 
 // --- Mixin ---

package/src/vendor/bootstrap-vue/src/components/form-textarea/form-textarea.js

@@ -1,12 +1,11 @@
 import { extend } from '../../vue'
 import { NAME_FORM_TEXTAREA } from '../../constants/components'
-import { PROP_TYPE_BOOLEAN, PROP_TYPE_NUMBER_STRING, PROP_TYPE_STRING } from '../../constants/props'
+import { PROP_TYPE_BOOLEAN, PROP_TYPE_NUMBER, PROP_TYPE_STRING } from '../../constants/props'
 import { getCS, getStyle, isVisible, requestAF, setStyle } from '../../utils/dom'
 import { isNull } from '../../utils/inspect'
 import { mathCeil, mathMax, mathMin } from '../../utils/math'
 import { toInteger, toFloat } from '../../utils/number'
 import { sortKeys } from '../../utils/object'
-import { makeProp } from '../../utils/props'
 import { formControlMixin, props as formControlProps } from '../../mixins/form-control'
 import { formSelectionMixin } from '../../mixins/form-selection'
 import { formSizeMixin, props as formSizeProps } from '../../mixins/form-size'
@@ -26,15 +25,35 @@ export const props = sortKeys({
   ...formSizeProps,
   ...formStateProps,
   ...formTextProps,
-  maxRows: makeProp(PROP_TYPE_NUMBER_STRING),
+  maxRows: {
+    type: [PROP_TYPE_NUMBER, PROP_TYPE_STRING],
+    required: false,
+    default: undefined
+  },
   // When in auto resize mode, disable shrinking to content height
-  noAutoShrink: makeProp(PROP_TYPE_BOOLEAN, false),
+  noAutoShrink: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  },
   // Disable the resize handle of textarea
-  noResize: makeProp(PROP_TYPE_BOOLEAN, false),
-  rows: makeProp(PROP_TYPE_NUMBER_STRING, 2),
+  noResize: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  },
+  rows: {
+    type: [PROP_TYPE_NUMBER, PROP_TYPE_STRING],
+    required: false,
+    default: 2
+  },
   // 'soft', 'hard' or 'off'
   // Browser default is 'soft'
-  wrap: makeProp(PROP_TYPE_STRING, 'soft')
+  wrap: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'soft'
+  }
 })
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/layout/col.js

@@ -7,7 +7,7 @@ import {
   PROP_TYPE_STRING
 } from '../../constants/props'
 import { RX_COL_CLASS } from '../../constants/regex'
-import { arrayIncludes } from '../../utils/array'
+
 import { getBreakpointsUpCached } from '../../utils/config'
 import { identity } from '../../utils/identity'
 import { isUndefinedOrNull } from '../../utils/inspect'
@@ -89,7 +89,7 @@ export const generateProps = () => {
     ...breakpointOrder,
     // Flex alignment
     alignSelf: makeProp(PROP_TYPE_STRING, null, value => {
-      return arrayIncludes(ALIGN_SELF_VALUES, value)
+      return ALIGN_SELF_VALUES.includes(value)
     }),
     // Generic flexbox 'col' (xs)
     col: makeProp(PROP_TYPE_BOOLEAN, false),

package/src/vendor/bootstrap-vue/src/components/modal/modal.js

@@ -31,7 +31,7 @@ import {
   SLOT_NAME_MODAL_OK,
   SLOT_NAME_MODAL_TITLE
 } from '../../constants/slots'
-import { arrayIncludes, concat } from '../../utils/array'
+import { concat } from '../../utils/array'
 import {
   attemptFocus,
   closest,
@@ -112,7 +112,7 @@ export const props = sortKeys({
     required: false,
     default: null,
     validator: value => {
-      return isUndefinedOrNull(value) || arrayIncludes(BUTTONS, value)
+      return isUndefinedOrNull(value) || BUTTONS.includes(value)
     }
   },
   bodyClass: {

package/src/vendor/bootstrap-vue/src/components/popover/popover.js

@@ -2,12 +2,12 @@ import { extend } from '../../vue'
 import { NAME_POPOVER } from '../../constants/components'
 import { EVENT_NAME_CLICK } from '../../constants/events'
 import {
-  PROP_TYPE_ARRAY_STRING,
-  PROP_TYPE_NUMBER_OBJECT_STRING,
+  PROP_TYPE_ARRAY,
+  PROP_TYPE_NUMBER,
+  PROP_TYPE_OBJECT,
   PROP_TYPE_STRING
 } from '../../constants/props'
 import { SLOT_NAME_TITLE } from '../../constants/slots'
-import { makeProp } from '../../utils/props'
 import { BTooltip, props as BTooltipProps } from '../tooltip/tooltip'
 import { BVPopover } from './helpers/bv-popover'
 import { sortKeys } from '../../utils/object'
@@ -16,10 +16,26 @@ import { sortKeys } from '../../utils/object'
 
 export const props = sortKeys({
   ...BTooltipProps,
-  content: makeProp(PROP_TYPE_STRING),
-  delay: makeProp(PROP_TYPE_NUMBER_OBJECT_STRING, { show: 50, hide: 150 }),
-  placement: makeProp(PROP_TYPE_STRING, 'right'),
-  triggers: makeProp(PROP_TYPE_ARRAY_STRING, EVENT_NAME_CLICK)
+  content: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  delay: {
+    type: [PROP_TYPE_NUMBER, PROP_TYPE_OBJECT, PROP_TYPE_STRING],
+    required: false,
+    default: () => ({ show: 50, hide: 150 })
+  },
+  placement: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'right'
+  },
+  triggers: {
+    type: [PROP_TYPE_ARRAY, PROP_TYPE_STRING],
+    required: false,
+    default: EVENT_NAME_CLICK
+  }
 })
 
 // --- Main component ---

package/src/vendor/bootstrap-vue/src/components/table/helpers/mixin-busy.js

@@ -4,7 +4,6 @@ import { PROP_TYPE_BOOLEAN } from '../../../constants/props'
 import { SLOT_NAME_TABLE_BUSY } from '../../../constants/slots'
 import { stopEvent } from '../../../utils/events'
 import { isFunction } from '../../../utils/inspect'
-import { makeProp } from '../../../utils/props'
 import { BTr } from '../tr'
 import { BTd } from '../td'
 
@@ -16,7 +15,11 @@ const MODEL_EVENT_NAME_BUSY = MODEL_EVENT_NAME_PREFIX + MODEL_PROP_NAME_BUSY
 // --- Props ---
 
 export const props = {
-  [MODEL_PROP_NAME_BUSY]: makeProp(PROP_TYPE_BOOLEAN, false)
+  [MODEL_PROP_NAME_BUSY]: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  }
 }
 
 // --- Mixin ---

package/src/vendor/bootstrap-vue/src/components/table/helpers/mixin-caption.js

@@ -2,13 +2,20 @@ import { extend } from '../../../vue'
 import { PROP_TYPE_STRING } from '../../../constants/props'
 import { SLOT_NAME_TABLE_CAPTION } from '../../../constants/slots'
 import { htmlOrText } from '../../../utils/html'
-import { makeProp } from '../../../utils/props'
 
 // --- Props ---
 
 export const props = {
-  caption: makeProp(PROP_TYPE_STRING),
-  captionHtml: makeProp(PROP_TYPE_STRING)
+  caption: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  captionHtml: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  }
   // `caption-top` is part of table-render mixin (styling)
   // captionTop: makeProp(PROP_TYPE_BOOLEAN, false)
 }

package/src/vendor/bootstrap-vue/src/components/table/helpers/mixin-empty.js

@@ -7,7 +7,6 @@ import {
 } from '../../../constants/slots'
 import { htmlOrText } from '../../../utils/html'
 import { isFunction } from '../../../utils/inspect'
-import { makeProp } from '../../../utils/props'
 import { safeVueInstance } from '../../../utils/safe-vue-instance'
 import { BTr } from '../tr'
 import { BTd } from '../td'
@@ -15,11 +14,31 @@ import { BTd } from '../td'
 // --- Props ---
 
 export const props = {
-  emptyFilteredHtml: makeProp(PROP_TYPE_STRING),
-  emptyFilteredText: makeProp(PROP_TYPE_STRING, 'There are no records matching your request'),
-  emptyHtml: makeProp(PROP_TYPE_STRING),
-  emptyText: makeProp(PROP_TYPE_STRING, 'There are no records to show'),
-  showEmpty: makeProp(PROP_TYPE_BOOLEAN, false)
+  emptyFilteredHtml: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  emptyFilteredText: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'There are no records matching your request'
+  },
+  emptyHtml: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
+  emptyText: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: 'There are no records to show'
+  },
+  showEmpty: {
+    type: PROP_TYPE_BOOLEAN,
+    required: false,
+    default: false
+  }
 }
 
 // --- Mixin ---

package/src/vendor/bootstrap-vue/src/components/table/helpers/mixin-items.js

@@ -9,7 +9,6 @@ import { makeModelMixin } from '../../../utils/model'
 
 import { toInteger } from '../../../utils/number'
 import { clone, sortKeys } from '../../../utils/object'
-import { makeProp } from '../../../utils/props'
 import { safeVueInstance } from '../../../utils/safe-vue-instance'
 import { normalizeFields } from './normalize-fields'
 
@@ -31,14 +30,30 @@ export { MODEL_PROP_NAME, MODEL_EVENT_NAME }
 
 export const props = sortKeys({
   ...modelProps,
-  fields: makeProp(PROP_TYPE_ARRAY, null),
+  fields: {
+    type: PROP_TYPE_ARRAY,
+    required: false,
+    default: null
+  },
   // Provider mixin adds in `Function` type
-  items: makeProp(PROP_TYPE_ARRAY, []),
+  items: {
+    type: PROP_TYPE_ARRAY,
+    required: false,
+    default: () => []
+  },
   // Primary key for record
   // If provided the value in each row must be unique!
-  primaryKey: makeProp(PROP_TYPE_STRING),
+  primaryKey: {
+    type: PROP_TYPE_STRING,
+    required: false,
+    default: undefined
+  },
   // `v-model` for retrieving the current displayed rows
-  [MODEL_PROP_NAME]: makeProp(PROP_TYPE_ARRAY, [])
+  [MODEL_PROP_NAME]: {
+    type: PROP_TYPE_ARRAY,
+    required: false,
+    default: () => []
+  }
 })
 
 // --- Mixin ---

package/src/vendor/bootstrap-vue/src/components/table/helpers/mixin-pagination.js

@@ -1,15 +1,22 @@
 import { extend } from '../../../vue'
-import { PROP_TYPE_NUMBER_STRING } from '../../../constants/props'
+import { PROP_TYPE_NUMBER, PROP_TYPE_STRING } from '../../../constants/props'
 import { mathMax } from '../../../utils/math'
 import { toInteger } from '../../../utils/number'
-import { makeProp } from '../../../utils/props'
 import { safeVueInstance } from '../../../utils/safe-vue-instance'
 
 // --- Props ---
 
 export const props = {
-  currentPage: makeProp(PROP_TYPE_NUMBER_STRING, 1),
-  perPage: makeProp(PROP_TYPE_NUMBER_STRING, 0)
+  currentPage: {
+    type: [PROP_TYPE_NUMBER, PROP_TYPE_STRING],
+    required: false,
+    default: 1
+  },
+  perPage: {
+    type: [PROP_TYPE_NUMBER, PROP_TYPE_STRING],
+    required: false,
+    default: 0
+  }
 }
 
 // --- Mixin ---