Skip to content

Commit acff32f

Browse files
committed
Merge branch 'master' into dev
2 parents 90986f2 + 4c85697 commit acff32f

Some content is hidden

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

64 files changed

+253
-270
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,9 @@ jobs:
3030
if: needs.pre_job.outputs.should_skip != 'true'
3131
runs-on: ubuntu-24.04
3232
steps:
33-
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
3433
- uses: actions/checkout@v4
3534
- uses: vuetifyjs/setup-action@master
36-
- run: pnpm build:lib
37-
working-directory: ./packages/vuetify
38-
- run: ucacher pnpm build:dist
39-
working-directory: ./packages/vuetify
40-
- run: ucacher pnpm build:types
41-
working-directory: ./packages/vuetify
35+
- run: pnpm build vuetify
4236
- uses: actions/upload-artifact@v4
4337
with:
4438
name: vuetify-dist
@@ -56,14 +50,13 @@ jobs:
5650
matrix:
5751
scopes: ['--scope vuetify --scope @vuetify/api-generator', '--scope vuetifyjs.com']
5852
steps:
59-
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
6053
- uses: actions/checkout@v4
6154
- uses: actions/download-artifact@v4
6255
with:
6356
name: vuetify-dist
6457
path: packages/vuetify
6558
- uses: vuetifyjs/setup-action@master
66-
- run: ucacher pnpm lerna run lint $SCOPES
59+
- run: pnpm lerna run lint $SCOPES
6760
env:
6861
SCOPES: ${{ matrix.scopes }}
6962

@@ -94,7 +87,6 @@ jobs:
9487
runs-on: ubuntu-24.04
9588
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
9689
steps:
97-
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
9890
- uses: actions/checkout@v4
9991
with:
10092
fetch-depth: 0
@@ -103,7 +95,7 @@ jobs:
10395
name: vuetify-dist
10496
path: packages/vuetify
10597
- uses: vuetifyjs/setup-action@master
106-
- run: ucacher pnpm build api
98+
- run: pnpm build api
10799
- run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
108100
- name: NPM Release
109101
run: bash scripts/deploy.sh
@@ -123,15 +115,14 @@ jobs:
123115
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')
124116
runs-on: ubuntu-24.04
125117
steps:
126-
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
127118
- uses: actions/checkout@v4
128119
- uses: actions/download-artifact@v4
129120
with:
130121
name: vuetify-dist
131122
path: packages/vuetify
132123
- uses: vuetifyjs/setup-action@master
133124
- uses: ./.github/actions/download-locales
134-
- run: ucacher pnpm build api
125+
- run: pnpm build api
135126
- run: pnpm build docs
136127
env:
137128
NODE_OPTIONS: --max-old-space-size=4096
@@ -154,7 +145,7 @@ jobs:
154145
publish-docs:
155146
needs: [lint, test-unit, build-docs]
156147
runs-on: ubuntu-24.04
157-
environment: Production
148+
environment: ${{ github.ref_name }}
158149
steps:
159150
- uses: actions/checkout@v4
160151
- uses: actions/download-artifact@v4

.ucacherignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.ucacherignore.env

Lines changed: 0 additions & 52 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Using [bun](https://bun.sh/)
190190
bun create vuetify
191191
```
192192

193-
For more information on how to get started, such as using Nuxt or Laravel, check out the official [Installation guide](/getting-started/installation/).
193+
For more information on how to get started, such as using Nuxt or Laravel, check out the official [Installation guide](https://vuetifyjs.com/getting-started/installation/).
194194

195195
### 🚀 Introduction
196196

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
}
1414
},
1515
"npmClient": "pnpm",
16-
"version": "3.7.10"
16+
"version": "3.7.12"
1717
}

packages/api-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuetify/api-generator",
3-
"version": "3.7.10",
3+
"version": "3.7.12",
44
"private": true,
55
"description": "",
66
"scripts": {

packages/docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "A Vue.js project",
44
"private": true,
55
"author": "John Leider <[email protected]>",
6-
"version": "3.7.10",
6+
"version": "3.7.12",
77
"repository": {
88
"type": "git",
99
"url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -87,7 +87,7 @@
8787
"vite-plugin-pages": "^0.32.1",
8888
"vite-plugin-pwa": "^0.17.4",
8989
"vite-plugin-vue-layouts": "^0.11.0",
90-
"vite-plugin-vuetify": "^2.0.4",
90+
"vite-plugin-vuetify": "^2.1.0",
9191
"vue-tsc": "^2.0.29"
9292
},
9393
"publishConfig": {

packages/docs/src/pages/en/components/alerts.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ features:
1919

2020
The `v-alert` component is used to convey important information to the user through the use of contextual types, icons, and colors.
2121

22-
![Alert Entry](https://cdn.vuetifyjs.com/docs/images/components-temp/v-alert/v-alert-entry.png)
23-
2422
<PageFeatures />
2523

2624
## Usage

packages/docs/src/pages/en/components/app-bars.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ features:
2424

2525
The `v-app-bar` component is pivotal to any graphical user interface (GUI), as it generally is the primary source of site navigation.
2626

27-
![App Bar Entry](https://cdn.vuetifyjs.com/docs/images/components-temp/v-app-bar/v-app-bar-entry.png)
28-
2927
<PageFeatures />
3028

3129
## Usage

packages/docs/src/pages/en/components/avatars.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ features:
2020

2121
The `v-avatar` component is typically used to display circular user profile pictures. This component will allow you to dynamically size and add a border radius of responsive images, icons, and text. When **rounded** prop set to `0` will display an avatar without border radius.
2222

23-
![Avatar Entry](https://cdn.vuetifyjs.com/docs/images/components-temp/v-avatar/v-avatar-entry.png)
24-
2523
<PageFeatures />
2624

2725
## Usage

0 commit comments

Comments
 (0)