Skip to content

Commit 859e78c

Browse files
committed
Merge branch 'master' into dev
2 parents 90410fb + ba81e80 commit 859e78c

File tree

38 files changed

+2142
-2160
lines changed

38 files changed

+2142
-2160
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
- run: pnpm build api
137137
- run: pnpm build docs
138138
env:
139-
NODE_OPTIONS: --max-old-space-size=6144
139+
NODE_OPTIONS: --max-old-space-size=8192
140140
VITE_COSMIC_2_BUCKET_SLUG: ${{ secrets.COSMIC_2_BUCKET_SLUG }}
141141
VITE_COSMIC_2_BUCKET_READ_KEY: ${{ secrets.COSMIC_2_BUCKET_READ_KEY }}
142142
VITE_COSMIC_BUCKET_SLUG: ${{ secrets.COSMIC_BUCKET_SLUG }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM caddy:2.10.0-alpine
1+
FROM caddy:2.10.2-alpine
22
COPY ./packages/docs/dist /srv
33
COPY ./packages/docs/build/Caddyfile /etc/caddy/Caddyfile

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.10.2"
16+
"version": "3.10.3"
1717
}

package.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
"@typescript-eslint/parser": "^8.32.0",
4343
"@typescript/native-preview": "7.0.0-dev.20250912.1",
4444
"@unhead/vue": "^2.0.5",
45-
"@vitejs/plugin-vue": "^5.2.1",
46-
"@vue/compiler-sfc": "^3.5.13",
47-
"@vue/language-server": "^2.2.8",
48-
"@vue/runtime-core": "^3.5.13",
49-
"@vue/runtime-dom": "^3.5.13",
45+
"@vitejs/plugin-vue": "^6.0.1",
46+
"@vue/compiler-sfc": "^3.5.21",
47+
"@vue/language-server": "^3.0.7",
48+
"@vue/runtime-core": "^3.5.21",
49+
"@vue/runtime-dom": "^3.5.21",
5050
"@vuetify/github-releaser": "^4.0.3",
5151
"@vueuse/head": "^1.3.1",
5252
"concurrently": "^9.1.2",
@@ -62,7 +62,7 @@
6262
"eslint-plugin-promise": "^6.6.0",
6363
"eslint-plugin-react": "^7.37.5",
6464
"eslint-plugin-sonarjs": "^0.25.1",
65-
"eslint-plugin-vue": "^10.0.0",
65+
"eslint-plugin-vue": "^10.4.0",
6666
"eslint-plugin-vuetify": "^2.5.2",
6767
"glob": "^11.0.1",
6868
"husky": "^9.1.7",
@@ -84,14 +84,13 @@
8484
"stringify-object": "^5.0.0",
8585
"typescript": "~5.8.3",
8686
"upath": "^2.0.1",
87-
"vite": "^6.3.5",
88-
"vite-plugin-inspect": "11.1.0",
89-
"vite-plugin-warmup": "^0.1.0",
90-
"vue": "^3.5.13",
91-
"vue-eslint-parser": "^10.1.3",
92-
"vue-tsc": "^2.2.10",
87+
"vite": "^7.1.5",
88+
"vite-plugin-inspect": "11.3.3",
89+
"vue": "^3.5.21",
90+
"vue-eslint-parser": "^10.2.0",
91+
"vue-tsc": "^3.0.7",
9392
"vuetify": "workspace:*",
9493
"yargs": "^17.7.2"
9594
},
96-
"packageManager": "pnpm@10.16.1"
95+
"packageManager": "pnpm@10.17.0"
9796
}

packages/api-generator/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vuetify/api-generator",
33
"type": "module",
4-
"version": "3.10.2",
4+
"version": "3.10.3",
55
"private": true,
66
"description": "",
77
"scripts": {
@@ -16,7 +16,7 @@
1616
"piscina": "^4.9.2",
1717
"prettier": "^3.5.3",
1818
"ts-morph": "^25.0.1",
19-
"vue": "^3.5.13",
19+
"vue": "^3.5.21",
2020
"vuetify": "workspace:*"
2121
},
2222
"devDependencies": {

packages/api-generator/src/locale/en/VDataTableHeaders.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"props": {
3+
"color": "Applies a color to sort badges in the table header.",
34
"disableSort": "Toggles rendering of sort button.",
45
"sortAscIcon": "Icon used for ascending sort button.",
56
"sortDescIcon": "Icon used for descending sort button.",

packages/api-generator/src/locale/en/VNumberInput.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"min": "Specifies the minimum allowable value for the input.",
99
"minFractionDigits": "Specifies the minimum fraction digits to be displayed (capped to `precision`). Defaults to `precision` when not explicitly set.",
1010
"precision": "Enforces strict precision. It is expected to be an integer value in range between `0` and `15`, or null for unrestricted.",
11-
"step": "Defines the interval between allowed values when the user increments or decrements the input"
11+
"step": "Defines the interval between allowed values when the user increments or decrements the input",
12+
"type": "**IGNORED** underlying input is always of type 'text'"
1213
},
1314
"slots": {
1415
"decrement": "Slot for customizing the decrement button or icon used to decrease the value of the input.",

packages/docs/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "A Vue.js project",
55
"private": true,
66
"author": "John Leider <[email protected]>",
7-
"version": "3.10.2",
7+
"version": "3.10.3",
88
"repository": {
99
"type": "git",
1010
"url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -37,8 +37,8 @@
3737
"roboto-fontface": "^0.10.0",
3838
"swetrix": "^3.6.1",
3939
"vee-validate": "^4.15.0",
40-
"vue": "^3.5.13",
41-
"vue-i18n": "^11.1.3",
40+
"vue": "^3.5.21",
41+
"vue-i18n": "^11.1.12",
4242
"vue-instantsearch": "^4.20.6",
4343
"vue-router": "^4.5.0",
4444
"vuetify": "workspace:*"
@@ -47,16 +47,16 @@
4747
"@babel/generator": "^7.27.0",
4848
"@babel/types": "^7.27.0",
4949
"@emailjs/browser": "^4.4.1",
50-
"@intlify/unplugin-vue-i18n": "^6.0.5",
50+
"@intlify/unplugin-vue-i18n": "^11.0.1",
5151
"@mdi/js": "7.4.47",
5252
"@mdi/svg": "7.4.47",
5353
"@octokit/openapi-types": "^25.0.0",
5454
"@types/babel__generator": "^7.27.0",
5555
"@types/markdown-it": "^14.1.2",
5656
"@types/markdown-it-container": "^2.0.10",
5757
"@types/prismjs": "^1.26.5",
58-
"@vitejs/plugin-basic-ssl": "^2.0.0",
59-
"@vue/compiler-sfc": "^3.5.13",
58+
"@vitejs/plugin-basic-ssl": "^2.1.0",
59+
"@vue/compiler-sfc": "^3.5.21",
6060
"@vuetify/api-generator": "workspace:*",
6161
"@yankeeinlondon/builder-api": "^1.4.1",
6262
"ajv": "^8.17.1",
@@ -81,10 +81,10 @@
8181
"unplugin-vue-components": "^0.28.0",
8282
"vite-plugin-md": "^0.22.5",
8383
"vite-plugin-pages": "^0.33.0",
84-
"vite-plugin-pwa": "^1.0.0",
84+
"vite-plugin-pwa": "^1.0.3",
8585
"vite-plugin-vue-layouts": "^0.11.0",
86-
"vite-plugin-vuetify": "^2.1.1",
87-
"vue-tsc": "^2.2.10"
86+
"vite-plugin-vuetify": "^2.1.2",
87+
"vue-tsc": "^3.0.7"
8888
},
8989
"publishConfig": {
9090
"access": "public"

packages/docs/src/examples/accessibility/menu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<script setup>
2626
function onClick () {
27-
// Perform an action
27+
// Perform an action
2828
}
2929
</script>
3030

packages/docs/src/examples/v-hotkey/prop-key-map.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ const customKeyMap = {
184184
const platform = ref('mac')
185185
186186
const customKeyMap = {
187-
// Include common keys that we're not customizing
187+
// Include common keys that we're not customizing
188188
shift: {
189189
mac: { symbol: '', icon: '$shift', text: '$vuetify.hotkey.shift' },
190190
default: { text: 'Shift' },
@@ -198,7 +198,7 @@ const customKeyMap = {
198198
default: { text: 'Ctrl' },
199199
},
200200
201-
// Custom key overrides
201+
// Custom key overrides
202202
ctrl: {
203203
mac: { symbol: '', icon: '$ctrl', text: 'Control' },
204204
default: { symbol: '', icon: '$ctrl', text: 'Control' },
@@ -211,7 +211,7 @@ const customKeyMap = {
211211
default: { symbol: '', icon: '$enter', text: 'Return' },
212212
},
213213
214-
// Include other keys for completeness
214+
// Include other keys for completeness
215215
arrowup: {
216216
default: { symbol: '', icon: '$arrowup', text: '$vuetify.hotkey.upArrow' },
217217
},

0 commit comments

Comments
 (0)