diff --git a/MIGRATION.md b/MIGRATION.md index 3f587abc3..99a1dc174 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -10,6 +10,10 @@ The `Condition` type was renamed to `BaseCondition` and a new `Condition` type w Both unions include their respective base type for backwards compatibility, but if you run into errors, replace `UISchemaElement` with `BaseUISchemaElement`/`Condition` with `BaseCondition` in your code to restore the old behaviour. +### Vuetify renderers now target vuetify `^3.8.0` + +The supported Vuetify version was raised from `^3.6.6` to `^3.8.0` due to the promotion of `VNumberInput` from labs to core. + ## Migrating to JSON Forms 3.5 ### Angular support now targets Angular 18 and Angular 19 diff --git a/packages/vue-vuetify/package.json b/packages/vue-vuetify/package.json index 2c566f7cc..1dd1d36ba 100644 --- a/packages/vue-vuetify/package.json +++ b/packages/vue-vuetify/package.json @@ -65,7 +65,7 @@ "lodash": "^4.17.21", "maska": "^2.1.11", "vue": "^3.4.21", - "vuetify": "^3.6.6" + "vuetify": "^3.8.0" }, "devDependencies": { "@fortawesome/fontawesome-free": "^6.5.2", @@ -115,6 +115,6 @@ "vue": "^3.4.21", "vue-eslint-parser": "^9.4.2", "vue-tsc": "^2.0.11", - "vuetify": "^3.6.6" + "vuetify": "^3.8.0" } } diff --git a/packages/vue-vuetify/src/controls/IntegerControlRenderer.vue b/packages/vue-vuetify/src/controls/IntegerControlRenderer.vue index 542666441..90c689df9 100644 --- a/packages/vue-vuetify/src/controls/IntegerControlRenderer.vue +++ b/packages/vue-vuetify/src/controls/IntegerControlRenderer.vue @@ -36,7 +36,7 @@ import { type RendererProps, } from '@jsonforms/vue'; import { defineComponent } from 'vue'; -import { VNumberInput } from 'vuetify/labs/VNumberInput'; +import { VNumberInput } from 'vuetify/components/VNumberInput'; import { useVuetifyControl } from '../util'; import { default as ControlWrapper } from './ControlWrapper.vue'; import { DisabledIconFocus } from './directives'; diff --git a/packages/vue-vuetify/src/controls/NumberControlRenderer.vue b/packages/vue-vuetify/src/controls/NumberControlRenderer.vue index af51a6114..09383ea8b 100644 --- a/packages/vue-vuetify/src/controls/NumberControlRenderer.vue +++ b/packages/vue-vuetify/src/controls/NumberControlRenderer.vue @@ -36,7 +36,7 @@ import { type RendererProps, } from '@jsonforms/vue'; import { defineComponent } from 'vue'; -import { VNumberInput } from 'vuetify/labs/VNumberInput'; +import { VNumberInput } from 'vuetify/components/VNumberInput'; import { useVuetifyControl } from '../util'; import { default as ControlWrapper } from './ControlWrapper.vue'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 09097040c..35ae32e00 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1375,7 +1375,7 @@ importers: version: 1.0.6(vite@5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6)) vite-plugin-vuetify: specifier: ^2.0.3 - version: 2.0.4(vite@5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6))(vue@3.4.27(typescript@5.4.5))(vuetify@3.7.0) + version: 2.0.4(vite@5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6))(vue@3.4.27(typescript@5.4.5))(vuetify@3.8.2) vitest: specifier: ^1.4.0 version: 1.6.0(@types/node@22.13.8)(jsdom@24.1.1)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6) @@ -1389,8 +1389,8 @@ importers: specifier: ^2.0.11 version: 2.0.29(typescript@5.4.5) vuetify: - specifier: ^3.6.6 - version: 3.7.0(typescript@5.4.5)(vite-plugin-vuetify@2.0.4)(vue@3.4.27(typescript@5.4.5)) + specifier: ^3.8.0 + version: 3.8.2(typescript@5.4.5)(vite-plugin-vuetify@2.0.4)(vue@3.4.27(typescript@5.4.5)) packages: '@achrinza/node-ipc@9.2.8': @@ -21195,25 +21195,22 @@ packages: typescript: optional: true - vuetify@3.7.0: + vuetify@3.8.2: resolution: { - integrity: sha512-x+UaU4SPYNcJSE/voCTBFrNn0q9Spzx2EMfDdUj0NYgHGKb59OqnZte+AjaJaoOXy1AHYIGEpm5Ryk2BEfgWuw==, + integrity: sha512-UJNFP4egmKJTQ3V3MKOq+7vIUKO7/Fko5G6yUsOW2Rm0VNBvAjgO6VY6EnK3DTqEKN6ugVXDEPw37NQSTGLZvw==, } engines: { node: ^12.20 || >=14.13 } peerDependencies: typescript: '>=4.7' - vite-plugin-vuetify: '>=1.0.0' - vue: ^3.3.0 - vue-i18n: ^9.0.0 - webpack-plugin-vuetify: '>=2.0.0' + vite-plugin-vuetify: '>=2.1.0' + vue: ^3.5.0 + webpack-plugin-vuetify: '>=3.1.0' peerDependenciesMeta: typescript: optional: true vite-plugin-vuetify: optional: true - vue-i18n: - optional: true webpack-plugin-vuetify: optional: true @@ -26913,11 +26910,11 @@ snapshots: '@vue/web-component-wrapper@1.3.0': {} - '@vuetify/loader-shared@2.0.3(vue@3.4.27(typescript@5.4.5))(vuetify@3.7.0)': + '@vuetify/loader-shared@2.0.3(vue@3.4.27(typescript@5.4.5))(vuetify@3.8.2)': dependencies: upath: 2.0.1 vue: 3.4.27(typescript@5.4.5) - vuetify: 3.7.0(typescript@5.4.5)(vite-plugin-vuetify@2.0.4)(vue@3.4.27(typescript@5.4.5)) + vuetify: 3.8.2(typescript@5.4.5)(vite-plugin-vuetify@2.0.4)(vue@3.4.27(typescript@5.4.5)) '@webassemblyjs/ast@1.12.1': dependencies: @@ -36722,14 +36719,14 @@ snapshots: picocolors: 1.0.1 vite: 5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6) - vite-plugin-vuetify@2.0.4(vite@5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6))(vue@3.4.27(typescript@5.4.5))(vuetify@3.7.0): + vite-plugin-vuetify@2.0.4(vite@5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6))(vue@3.4.27(typescript@5.4.5))(vuetify@3.8.2): dependencies: - '@vuetify/loader-shared': 2.0.3(vue@3.4.27(typescript@5.4.5))(vuetify@3.7.0) + '@vuetify/loader-shared': 2.0.3(vue@3.4.27(typescript@5.4.5))(vuetify@3.8.2) debug: 4.3.4 upath: 2.0.1 vite: 5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6) vue: 3.4.27(typescript@5.4.5) - vuetify: 3.7.0(typescript@5.4.5)(vite-plugin-vuetify@2.0.4)(vue@3.4.27(typescript@5.4.5)) + vuetify: 3.8.2(typescript@5.4.5)(vite-plugin-vuetify@2.0.4)(vue@3.4.27(typescript@5.4.5)) transitivePeerDependencies: - supports-color @@ -36965,12 +36962,12 @@ snapshots: optionalDependencies: typescript: 5.5.4 - vuetify@3.7.0(typescript@5.4.5)(vite-plugin-vuetify@2.0.4)(vue@3.4.27(typescript@5.4.5)): + vuetify@3.8.2(typescript@5.4.5)(vite-plugin-vuetify@2.0.4)(vue@3.4.27(typescript@5.4.5)): dependencies: vue: 3.4.27(typescript@5.4.5) optionalDependencies: typescript: 5.4.5 - vite-plugin-vuetify: 2.0.4(vite@5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6))(vue@3.4.27(typescript@5.4.5))(vuetify@3.7.0) + vite-plugin-vuetify: 2.0.4(vite@5.4.2(@types/node@22.13.8)(less@4.2.0)(sass@1.77.6)(stylus@0.57.0)(terser@5.31.6))(vue@3.4.27(typescript@5.4.5))(vuetify@3.8.2) w3c-hr-time@1.0.2: dependencies: