Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
KaelWD committed Jan 28, 2025
2 parents b6db70d + 5ffe48d commit a836f68
Show file tree
Hide file tree
Showing 146 changed files with 838 additions and 1,036 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,15 @@ jobs:
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-24.04
steps:
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
- uses: actions/checkout@v4
- uses: vuetifyjs/setup-action@master
- run: pnpm build vuetify
- run: pnpm build:lib
working-directory: ./packages/vuetify
- run: ucacher pnpm build:dist
working-directory: ./packages/vuetify
- run: ucacher pnpm build:types
working-directory: ./packages/vuetify
- uses: actions/upload-artifact@v4
with:
name: vuetify-dist
Expand All @@ -50,13 +56,14 @@ jobs:
matrix:
scopes: ['--scope vuetify --scope @vuetify/api-generator', '--scope vuetifyjs.com']
steps:
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: vuetify-dist
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- run: pnpm lerna run lint $SCOPES
- run: ucacher pnpm lerna run lint $SCOPES
env:
SCOPES: ${{ matrix.scopes }}

Expand Down Expand Up @@ -87,6 +94,7 @@ jobs:
runs-on: ubuntu-24.04
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
steps:
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand All @@ -95,7 +103,7 @@ jobs:
name: vuetify-dist
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- run: pnpm build api
- run: ucacher pnpm build api
- run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
- name: NPM Release
run: bash scripts/deploy.sh
Expand All @@ -115,14 +123,15 @@ jobs:
if: needs.pre_job.outputs.should_skip != 'true' && github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/next')
runs-on: ubuntu-24.04
steps:
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: vuetify-dist
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- uses: ./.github/actions/download-locales
- run: pnpm build api
- run: ucacher pnpm build api
- run: pnpm build docs
env:
NODE_OPTIONS: --max-old-space-size=4096
Expand Down
5 changes: 5 additions & 0 deletions .ucacherignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.git/**/*
node_modules/**/*
/tmp/**/*
.github/workflows/**/*
package.json
52 changes: 52 additions & 0 deletions .ucacherignore.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
ACTIONS_RUNTIME_TOKEN
GITHUB_ACTION
GITHUB_ACTION_PATH
GITHUB_ACTION_REF
GITHUB_ACTOR
GITHUB_ACTOR_ID
GITHUB_API_URL
GITHUB_BASE_REF
GITHUB_ENV
GITHUB_EVENT_NAME
GITHUB_EVENT_PATH
GITHUB_GRAPHQL_URL
GITHUB_HEAD_REF
GITHUB_JOB
GITHUB_OUTPUT
GITHUB_PATH
GITHUB_REF
GITHUB_REF_NAME
GITHUB_REF_PROTECTED
GITHUB_REF_TYPE
GITHUB_RETENTION_DAYS
GITHUB_RUN_ATTEMPT
GITHUB_RUN_ID
GITHUB_RUN_NUMBER
GITHUB_SERVER_URL
GITHUB_SHA
GITHUB_STATE
GITHUB_STEP_SUMMARY
GITHUB_TOKEN
GITHUB_TRIGGERING_ACTOR
GITHUB_WORKFLOW
GITHUB_WORKFLOW_REF
GITHUB_WORKFLOW_SHA
GITHUB_WORKSPACE
HOSTNAME
INVOCATION_ID
JOURNAL_STREAM
LOG_LEVEL
LS_COLORS
RUNNER_DEBUG
RUNNER_ENVIRONMENT
RUNNER_NAME
RUNNER_TEMP
RUNNER_TOOL_CACHE
RUNNER_TRACKING_ID
SSH_CLIENT
SSH_CONNECTION
STATS_BLT
STATS_EXTP
SYSTEMD_EXEC_PID
VITE_GITHUB_SHA
XDG_SESSION_ID
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
}
},
"npmClient": "pnpm",
"version": "3.7.7"
"version": "3.7.8"
}
2 changes: 1 addition & 1 deletion 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.7.7",
"version": "3.7.8",
"private": true,
"description": "",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VBadge.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"label": "The **aria-label** used for the badge.",
"max": "Sets the maximum number allowed when using the **content** prop with a `number` like value. If the content number exceeds the maximum value, a `+` suffix is added.",
"offsetX": "Offset the badge on the x-axis.",
"offsetY": "Offset the badge on the y-axis."
"offsetY": "Offset the badge on the y-axis.",
"modelValue": "Controls whether the component is visible or hidden."
},
"slots": {
"badge": "The slot used for the badge's content."
Expand Down
1 change: 1 addition & 0 deletions packages/api-generator/src/locale/en/VChip.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"label": "Applies a medium size border radius.",
"outlined": "Removes background and applies border and text color.",
"pill": "Remove `v-avatar` padding.",
"size": "Sets the height, padding and the font size of the component. Accepts only predefined options: **x-small**, **small**, **default**, **large**, and **x-large**.",
"value": "The value used when a child of a [v-chip-group](/components/chip-groups)."
},
"events": {
Expand Down
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VDataTableHeaders.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"disableSort": "Toggles rendering of sort button.",
"sortAscIcon": "Icon used for ascending sort button.",
"sortDescIcon": "Icon used for descending sort button.",
"sticky": "Sticks the header to the top of the table."
"sticky": "Deprecated, use `fixed-header` instead.",
"fixedHeader": "Sticks the header to the top of the table."
},
"slots": {
"[`column.${string}`]": "Slot for custom rendering of a column.",
Expand Down
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VEmptyState.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"href": "The URL the action button links to.",
"justify": "Control the justification of the text.",
"textWidth": "Sets the width of the text container.",
"to": "The URL the action button links to."
"to": "The URL the action button links to.",
"size": "The size used to control the dimensions of the media element inside the component. Can be specified as a number or a string (e.g., '50%', '100px')."
},
"events": {
"click:action": "Event emitted when the action button is clicked."
Expand Down
1 change: 0 additions & 1 deletion packages/api-generator/src/locale/en/VFileInput.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"hideInput": "Display the icon only without the input (file names).",
"multiple": "Adds the **multiple** attribute to the input, allowing multiple file selections.",
"showSize": "Sets the displayed size of selected file(s). When using **true** will default to _1000_ displaying (**kB, MB, GB**) while _1024_ will display (**KiB, MiB, GiB**).",
"smallChips": "Changes display of selections to chips with the **small** property.",
"truncateLength": "The length of a filename before it is truncated with ellipsis.",
"value": "A single or array of [File objects](https://developer.mozilla.org/en-US/docs/Web/API/File)."
},
Expand Down
1 change: 0 additions & 1 deletion packages/api-generator/src/locale/en/VSelect.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"overflow": "Creates an overflow button - [spec](https://material.io/guidelines/components/buttons.html#buttons-dropdown-buttons).",
"searchInput": "Use the **.sync** modifier to catch user input from the search input.",
"segmented": "Creates a segmented button - [spec](https://material.io/guidelines/components/buttons.html#buttons-dropdown-buttons).",
"smallChips": "Changes display of selections to chips with the **small** property.",
"tags": "Tagging functionality, allows the user to create new values not available from the **items** prop."
},
"events": {
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A Vue.js project",
"private": true,
"author": "John Leider <[email protected]>",
"version": "3.7.7",
"version": "3.7.8",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/app/Toc.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
>
<a
:href="href"
class="v-toc-link d-block transition-swing text-decoration-none"
class="v-toc-link d-block text-decoration-none"
@click.prevent.stop="onClick(to)"
v-text="text"
/>
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/components/doc/VueJobs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
>
<v-card
:href="job.url"
class="transition-swing"
max-height="225"
rel="sponsored"
target="_blank"
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/examples/UsageExample.vue
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
{
name: 'template',
language: 'html',
content: `<template>\n <v-app>\n <v-container>\n ${props.code.replaceAll('\n', '\n ')}\n </v-container>\n </v-app>\n</template>\n${props.script}`,
content: `<template>\n <v-app>\n <v-container>\n ${props.code.replaceAll('\n', '\n ')}\n </v-container>\n </v-app>\n</template>\n${props.script || ''}`,
},
]))
</script>
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/components/home/Features.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<v-responsive class="text-xs-center">
<v-responsive class="text-center">
<v-container>
<v-row justify="center">
<v-col
Expand All @@ -13,7 +13,7 @@
:rel="feature.href && 'noopener noreferrer'"
:target="feature.href && '_blank'"
:to="feature.to"
class="text-xs-center mx-auto"
class="text-center mx-auto"
max-width="350"
border
flat
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/components/home/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
:src="`https://cdn.vuetifyjs.com/docs/images/logos/vuetify-logo-${theme.current.value.dark ? 'dark' : 'light'}-slim.svg`"
class="mx-auto"
height="64"
contain
/>
</v-col>

Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/components/introduction/Comparison.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
height="24"
max-width="24"
width="24"
contain
/>

<div v-text="framework.name" />
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/components/promoted/Promoted.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
class="mx-1 mx-md-2"
height="56"
max-width="56"
contain
/>

<AppMarkdown
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/components/sponsor/Card.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
:src="src"
:width="imgWidth"
max-height="64"
contain
/>
</v-card>
</template>
Expand Down
18 changes: 8 additions & 10 deletions packages/docs/src/examples/accessibility/list-item-group.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
class="mx-auto"
max-width="500"
>
<v-list>
<v-list-item-group v-model="model">
<v-list-item
v-for="(item, i) in items"
:key="i"
:disabled="item.disabled"
:title="item.text"
>
</v-list-item>
</v-list-item-group>
<v-list v-model="model">
<v-list-item
v-for="(item, i) in items"
:key="i"
:disabled="item.disabled"
:title="item.text"
:value="item"
></v-list-item>
</v-list>
</v-card>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
color="primary"
rounded="pill"
text="Update Account"
flat
variant="flat"
></v-btn>
</v-container>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
color="primary"
rounded="0"
text="Update Account"
flat
variant="flat"
></v-btn>
</v-container>
</template>
2 changes: 1 addition & 1 deletion packages/docs/src/examples/elevation/prop-dynamic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div
v-bind="props"
:class="`elevation-${isHovering ? 24 : 6}`"
class="mx-auto pa-6 transition-swing"
class="mx-auto pa-6"
>
Class based elevation
</div>
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/examples/transitions/misc-fab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<template v-slot:activator="{ props }">
<v-btn
color="primary"
dark
v-bind="props"
>
Fab Transition
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/examples/transitions/misc-fade.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<template v-slot:activator="{ props }">
<v-btn
color="primary"
dark
v-bind="props"
>
Fade Transition
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/examples/transitions/misc-scale.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<template v-slot:activator="{ props }">
<v-btn
color="primary"
dark
v-bind="props"
>
Scale Transition
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<template v-slot:activator="{ props }">
<v-btn
color="primary"
dark
v-bind="props"
>
Scale Transition
Expand Down
13 changes: 5 additions & 8 deletions packages/docs/src/examples/v-app-bar/misc-app-bar-nav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,14 @@
temporary
>
<v-list
dense
v-model="group"
color="deep-purple-accent-4"
density="compact"
nav
>
<v-list-item-group
v-model="group"
active-class="deep-purple--text text--accent-4"
>
<v-list-item prepend-icon="mdi-home" title="Home"></v-list-item>
<v-list-item prepend-icon="mdi-home" title="Home" value="home"></v-list-item>

<v-list-item prepend-icon="mdi-account" title="Account"></v-list-item>
</v-list-item-group>
<v-list-item prepend-icon="mdi-account" title="Account" value="account"></v-list-item>
</v-list>
</v-navigation-drawer>
<v-main>
Expand Down
Loading

0 comments on commit a836f68

Please sign in to comment.