Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
johnleider committed Apr 3, 2024
2 parents 8e1f56e + 338fe86 commit d841bb3
Show file tree
Hide file tree
Showing 217 changed files with 3,217 additions and 6,121 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ jobs:
id: create_release
run: yarn conventional-github-releaser -p vuetify
env:
DEBUG: '*'
CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build-docs:
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
"version": "3.5.9",
"version": "3.5.14",
"useWorkspaces": true
}
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@vueuse/head": "^1.3.1",
"babel-eslint": "^10.1.0",
"babel-jest": "^28.1.3",
"conventional-changelog-cli": "^4.1.0",
"conventional-changelog-cli": "^3.0.0",
"conventional-changelog-vuetify": "^1.2.1",
"conventional-github-releaser": "^3.1.5",
"cross-env": "^7.0.3",
Expand Down Expand Up @@ -87,9 +87,5 @@
"vue-router": "^4.2.5",
"vue-tsc": "^1.8.27",
"yargs": "^17.7.2"
},
"resolutions": {
"conventional-changelog": "4.0.0",
"conventional-changelog-preset-loader": "3.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/api-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
"version": "3.5.9",
"version": "3.5.14",
"private": true,
"description": "",
"scripts": {
Expand All @@ -17,7 +17,7 @@
"ts-morph": "^20.0.0",
"tsx": "^4.6.2",
"vue": "^3.4.19",
"vuetify": "^3.5.9"
"vuetify": "^3.5.14"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
Expand Down
1 change: 1 addition & 0 deletions packages/api-generator/src/locale/en/VAutocomplete.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"props": {
"autoSelectFirst": "When searching, will always highlight the first option and select it on blur. `exact` will only highlight and select exact matches.",
"clearOnSelect": "Reset the search text when a selection is made while using the **multiple** prop.",
"itemChildren": "This property currently has **no effect**.",
"filter": "The filtering algorithm used when searching. [example](https://github.com/vuetifyjs/vuetify/blob/master/packages/vuetify/src/components/VAutocomplete/VAutocomplete.ts#L40).",
"items": "Can be an array of objects or strings. By default objects should have **title** and **value** properties, and can optionally have a **props** property containing any [VListItem props](/api/v-list-item/#props). Keys to use for these can be changed with the **item-title**, **item-value**, and **item-props** props.",
"noFilter": "Do not apply filtering when searching. Useful when data is being filtered server side."
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VCarousel.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"props": {
"color": "Applies a color to the navigation dots - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"color": "Applies a color to the navigation dots - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"continuous": "Determines whether carousel is continuous.",
"cycle": "Determines if the carousel should cycle through images.",
"delimiterIcon": "Sets icon for carousel delimiter.",
Expand Down
1 change: 1 addition & 0 deletions packages/api-generator/src/locale/en/VCombobox.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"props": {
"autoSelectFirst": "When searching, will always highlight the first option and select it on blur. `exact` will only highlight and select exact matches.",
"clearOnSelect": "Reset the search text when a selection is made while using the **multiple** prop.",
"itemChildren": "This property currently has **no effect**.",
"delimiters": "Accepts an array of strings that will trigger a new tag when typing. Does not replace the normal Tab and Enter keys.",
"items": "Can be an array of objects or strings. By default objects should have **title** and **value** properties, and can optionally have a **props** property containing any [VListItem props](/api/v-list-item/#props). Keys to use for these can be changed with the **item-title**, **item-value**, and **item-props** props."
},
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VListItem.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"props": {
"active": "Controls the **active** state of the item. This is typically used to highlight the component.",
"color": "Applies specified color to the control when in an **active** state or **input-value** is **true** - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors),",
"color": "Applies specified color to the control when in an **active** state or **input-value** is **true** - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors),",
"contained": "Changes the component style by changing how color is applied to the background.",
"title": "Generates a `v-list-item-title` component with the supplied value. Note that this overrides the native [`title`](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/title) attribute, that must be set with `v-bind:title.attr` instead.",
"value": "The value used for selection."
Expand Down
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VNavigationDrawer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"scrim": "Determines whether an overlay is used when a **temporary** drawer is open. Accepts true/false to enable background, and string to define color.",
"temporary": "A temporary drawer sits above its application and uses a scrim (overlay) to darken the background.",
"touchless": "Disable mobile touch functionality.",
"value": "Controls whether the component is visible or hidden."
"value": "Controls whether the component is visible or hidden.",
"location": "Controls the edge of the screen the drawer is attached to."
},
"slots": {
"append": "A slot at the bottom of the drawer.",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VPagination.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"props": {
"ariaLabel": "Label for the root element.",
"color": "Applies specified color to the selected page button - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"color": "Applies specified color to the selected page button - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"currentPageAriaLabel": "Label for the currently selected page.",
"ellipsis": "Text to show between page buttons when truncating the list.",
"firstAriaLabel": "Label for the go to first button.",
Expand Down
1 change: 1 addition & 0 deletions packages/api-generator/src/locale/en/VSelect.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"combobox": "The single select variant of **tags**.",
"hideSelected": "Do not display in the select menu items that are already selected.",
"itemColor": "Sets color of selected items.",
"itemChildren": "This property currently has **no effect**.",
"itemDisabled": "Set property of **items**'s disabled value.",
"items": "Can be an array of objects or strings. By default objects should have **title** and **value** properties, and can optionally have a **props** property containing any [VListItem props](/api/v-list-item/#props). Keys to use for these can be changed with the **item-title**, **item-value**, and **item-props** props.",
"itemText": "Set property of **items**'s title value.",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VTab.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"direction": "Changes the direction of the tabs. Can be either `horizontal` or `vertical`.",
"hideSlider": "Hides the active tab slider component (no exit or enter animation).",
"fixed": "Forces component to take up all available space up to their maximum width (300px), and centers it.",
"sliderColor": "Applies specified color to the slider when active on that component - supports utility colors (for example success or purple) or css color (#033 or rgba(255, 0, 0, 0.5)). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"sliderColor": "Applies specified color to the slider when active on that component - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"stacked": "Displays the tab as a flex-column."
},
"events": {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VTabs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"props": {
"alignTabs": "Aligns the tabs to the `start`, `center`, or `end` of container. Also accepts `title` to align with the `v-toolbar-title` component.",
"alignWithTitle": "Make `v-tabs` lined up with the toolbar title.",
"color": "Applies specified color to the selected tab - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"color": "Applies specified color to the selected tab - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"centered": "Centers the tabs.",
"centerActive": "Forces the selected tab to be centered.",
"cycle": "Will reset to first or last tab when swiping left or right if at the end of indexes.",
Expand Down
9 changes: 5 additions & 4 deletions packages/api-generator/src/locale/en/VTimePicker.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
"format": "Defines the format of a time displayed in picker. Available options are `ampm` and `24hr`.",
"max": "Maximum allowed time.",
"min": "Minimum allowed time.",
"hide-header": "Hide the header of the picker.",
"readonly": "Puts picker in readonly state.",
"scrollable": "Allows changing hour/minute with mouse scroll.",
"useSeconds": "Toggles the use of seconds in picker.",
"use-seconds": "Toggles the use of seconds in picker.",
"value": "Time picker model (ISO 8601 format, 24hr hh:mm).",
"width": "Width of the picker."
},
Expand All @@ -19,9 +20,9 @@
},
"events": {
"change": "Emitted when the time selection is done (when user changes the minute for HH:MM picker and the second for HH:MM:SS picker.",
"click:hour": "Emitted when user selects the hour.",
"click:minute": "Emitted when user selects the minute.",
"click:second": "Emitted when user selects the second.",
"update:hour": "Emitted when user selects the hour.",
"update:minute": "Emitted when user selects the minute.",
"update:second": "Emitted when user selects the second.",
"update:period": "Emitted when user clicks the AM/PM button."
}
}
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VTimelineItem.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"props": {
"alignDot": "Align the dot to the **start** or **end** of the item.",
"color": "Applies specified color to the item dot - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"color": "Applies specified color to the item dot - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"dotColor": "Color of the item dot.",
"fillDot": "Remove outer border of item dot, making the color fill the entire dot.",
"hideDot": "Hide the timeline item dot.",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VTreeview.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"props": {
"activatable": "Allows user to mark a node as active by clicking on it.",
"color": "Applies specified color to the active node - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"color": "Applies specified color to the active node - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"dense": "Decreases the height of the items.",
"disabled": "Disables selection for all nodes.",
"disablePerNode": "Prevents disabling children nodes.",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/border.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"props": {
"border": "Applies border styles to component."
"border": "Designates the **border-radius** applied to the component. This can be **xs**, **sm**, **md**, **lg**, **xl**."
}
}
4 changes: 2 additions & 2 deletions packages/api-generator/src/locale/en/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"baseColor": "Sets the color of component when not focused.",
"bgColor": "Applies specified color to the control's background. Used on components that also support the **color** prop. - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"clearable": "Allows for the component to be cleared.",
"color": "Applies specified color to the control - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"color": "Applies specified color to the control - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"contentClass": "Applies a custom class to the detached element. This is useful because the content is moved to the beginning of the `v-app` component (unless the **attach** prop is provided) and is not targetable by classes passed directly on the component.",
"counter": "Creates counter for input length; if no number is specified, it defaults to 25. Does not apply any validation.",
"disabled": "Removes the ability to click or target the component.",
Expand Down Expand Up @@ -51,7 +51,7 @@
"symbol": "The [Symbol](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol) used to hook into group functionality for components like [v-btn-toggle](/components/btn-toggle) and [v-bottom-navigation](/components/bottom-navigations/).",
"tag": "Specify a custom tag used on the root element.",
"text": "Specify content text for the component.",
"textColor": "Applies a specified color to the control text - supports utility colors (for example `success` or `purple`) or css color (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"textColor": "Applies a specified color to the control text - supports utility colors (for example `success` or `purple`) or css color (`#033` or `rgba(255, 0, 0, 0.5)`). Find a list of built-in classes on the [colors page](/styles/colors#material-colors).",
"title": "Specify a title text for the component.",
"trueValue": "Sets value for truthy state.",
"valueComparator": "Apply a custom comparison algorithm to compare **model-value** and values contains in the **items** prop.",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/rounded.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"props": {
"rounded": "Designates the **border-radius** applied to the component. You can find more information on the [Border Radius page](/styles/border-radius).",
"rounded": "Designates the **border-radius** applied to the component. This can be **0**, **xs**, **sm**, true, **lg**, **xl**, **pill**, **circle**, and **shaped**. Find more information on available border radius classes on the [Border Radius page](/styles/border-radius).",
"tile": "Removes any applied **border-radius** from the component."
}
}
3 changes: 3 additions & 0 deletions packages/docs/auto-imports.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ declare global {
const useOneStore: typeof import('@vuetify/one')['useOneStore']
const usePinsStore: typeof import('./src/stores/pins')['usePinsStore']
const usePlayground: typeof import('./src/composables/playground')['usePlayground']
const useProductsStore: typeof import('@vuetify/one')['useProductsStore']
const usePromotionsStore: typeof import('./src/stores/promotions')['usePromotionsStore']
const useReleasesStore: typeof import('./src/stores/releases')['useReleasesStore']
const useRoute: typeof import('vue-router')['useRoute']
Expand Down Expand Up @@ -164,6 +165,7 @@ declare module 'vue' {
readonly useOneStore: UnwrapRef<typeof import('@vuetify/one')['useOneStore']>
readonly usePinsStore: UnwrapRef<typeof import('./src/stores/pins')['usePinsStore']>
readonly usePlayground: UnwrapRef<typeof import('./src/composables/playground')['usePlayground']>
readonly useProductsStore: UnwrapRef<typeof import('@vuetify/one')['useProductsStore']>
readonly usePromotionsStore: UnwrapRef<typeof import('./src/stores/promotions')['usePromotionsStore']>
readonly useReleasesStore: UnwrapRef<typeof import('./src/stores/releases')['useReleasesStore']>
readonly useRoute: UnwrapRef<typeof import('vue-router')['useRoute']>
Expand Down Expand Up @@ -252,6 +254,7 @@ declare module '@vue/runtime-core' {
readonly useOneStore: UnwrapRef<typeof import('@vuetify/one')['useOneStore']>
readonly usePinsStore: UnwrapRef<typeof import('./src/stores/pins')['usePinsStore']>
readonly usePlayground: UnwrapRef<typeof import('./src/composables/playground')['usePlayground']>
readonly useProductsStore: UnwrapRef<typeof import('@vuetify/one')['useProductsStore']>
readonly usePromotionsStore: UnwrapRef<typeof import('./src/stores/promotions')['usePromotionsStore']>
readonly useReleasesStore: UnwrapRef<typeof import('./src/stores/releases')['useReleasesStore']>
readonly useRoute: UnwrapRef<typeof import('vue-router')['useRoute']>
Expand Down
3 changes: 3 additions & 0 deletions packages/docs/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ declare module 'vue' {
AppBarThemeToggle: typeof import('./src/components/app/bar/ThemeToggle.vue')['default']
AppBtn: typeof import('./src/components/app/Btn.vue')['default']
AppCaption: typeof import('./src/components/app/Caption.vue')['default']
AppCommitBtn: typeof import('./src/components/app/CommitBtn.vue')['default']
AppDivider: typeof import('./src/components/app/Divider.vue')['default']
AppDrawerAppend: typeof import('./src/components/app/drawer/Append.vue')['default']
AppDrawerDrawer: typeof import('./src/components/app/drawer/Drawer.vue')['default']
Expand Down Expand Up @@ -86,6 +87,7 @@ declare module 'vue' {
AppToc: typeof import('./src/components/app/Toc.vue')['default']
AppTooltipBtn: typeof import('./src/components/app/TooltipBtn.vue')['default']
AppV2Banner: typeof import('./src/components/app/V2Banner.vue')['default']
AppVersionBtn: typeof import('./src/components/app/VersionBtn.vue')['default']
AppVerticalDivider: typeof import('./src/components/app/VerticalDivider.vue')['default']
Backmatter: typeof import('./src/components/Backmatter.vue')['default']
ComponentsListItem: typeof import('./src/components/components/ListItem.vue')['default']
Expand All @@ -97,6 +99,7 @@ declare module 'vue' {
DocMadeWithVueAttribution: typeof import('./src/components/doc/MadeWithVueAttribution.vue')['default']
DocMadeWithVuetifyGallery: typeof import('./src/components/doc/MadeWithVuetifyGallery.vue')['default']
DocMadeWithVuetifyLink: typeof import('./src/components/doc/MadeWithVuetifyLink.vue')['default']
DocPremiumThemesGallery: typeof import('./src/components/doc/PremiumThemesGallery.vue')['default']
DocReadyForMore: typeof import('./src/components/doc/ReadyForMore.vue')['default']
DocRelatedPage: typeof import('./src/components/doc/RelatedPage.vue')['default']
DocRelatedPages: typeof import('./src/components/doc/RelatedPages.vue')['default']
Expand Down

0 comments on commit d841bb3

Please sign in to comment.