chore: update vue to v3.2.35 (#15126)

vuetifyjs · May 22, 2022 · 44fb381 · 44fb381
1 parent c612aa9
commit 44fb381
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 234 deletions.
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "@octokit/core": "^3.6.0",
     "@typescript-eslint/eslint-plugin": "^5.17.0",
     "@typescript-eslint/parser": "^5.17.0",
-    "@vue/compiler-sfc": "^3.2.31",
+    "@vue/compiler-sfc": "^3.2.35",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.3",
     "conventional-changelog-cli": "^2.2.2",
@@ -71,7 +71,7 @@
     "shelljs": "^0.8.5",
     "typescript": "^4.6.3",
     "vite-plugin-inspect": "^0.4.3",
-    "vue": "^3.2.31",
+    "vue": "^3.2.35",
     "vue-analytics": "^5.16.1",
     "vue-router": "^4.0.14"
   },

diff --git a/packages/api-generator/package.json b/packages/api-generator/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "deepmerge": "^4.0.0",
     "rimraf": "^3.0.2",
-    "vue": "^3.2.31",
+    "vue": "^3.2.35",
     "vuetify": "^3.0.0-beta.2"
   },
   "devDependencies": {

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -20,14 +20,14 @@
     "fix:md": "markdownlint --config .markdownlintrc src/pages/en --fix"
   },
   "dependencies": {
-    "@vueuse/head": "~0.7.5",
+    "@vueuse/head": "~0.7.6",
     "cosmicjs": "^4.1.5",
     "lodash-es": "^4.17.21",
     "pinia": "^2.0.13",
     "prism-theme-vars": "^0.2.2",
     "prismjs": "^1.27.0",
     "roboto-fontface": "^0.10.0",
-    "vue": "^3.2.31",
+    "vue": "^3.2.35",
     "vue-i18n": "^9.2.0-beta.34",
     "vue-prism-component": "^2.0.0",
     "vuetify": "^3.0.0-beta.2"
@@ -39,7 +39,7 @@
     "@types/prismjs": "^1.26.0",
     "@types/rimraf": "^3.0.2",
     "@vitejs/plugin-vue": "^2.3.1",
-    "@vue/compiler-sfc": "^3.2.31",
+    "@vue/compiler-sfc": "^3.2.35",
     "@vuetify/vite-ssg": "^0.19.0",
     "ajv": "^8.11.0",
     "front-matter": "^4.0.2",
@@ -61,7 +61,7 @@
     "vite-plugin-pages": "^0.22.0",
     "vite-plugin-pwa": "^0.11.13",
     "vite-plugin-vue-layouts": "^0.6.0",
-    "vue-tsc": "^0.33.9",
+    "vue-tsc": "^0.34.15",
     "workbox-precaching": "^6.5.3",
     "workbox-routing": "^6.5.3",
     "workbox-strategies": "^6.5.3",

diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
@@ -124,7 +124,7 @@
     "@vitejs/plugin-vue-jsx": "^1.3.9",
     "@vue/babel-plugin-jsx": "^1.1.1",
     "@vue/test-utils": "2.0.0-rc.9",
-    "@vueuse/head": "^0.7.5",
+    "@vueuse/head": "~0.7.6",
     "acorn-walk": "^8.2.0",
     "autoprefixer": "^10.4.4",
     "babel-plugin-add-import-extension": "1.5.1",
@@ -155,7 +155,7 @@
   },
   "peerDependencies": {
     "@formatjs/intl": "^1.0.0 || ^2.0.0",
-    "vue": "^3.2.31",
+    "vue": "^3.2.35",
     "vue-i18n": "^9.0.0"
   },
   "peerDependenciesMeta": {

diff --git a/packages/vuetify/src/components/VAppBar/VAppBarTitle.tsx b/packages/vuetify/src/components/VAppBar/VAppBarTitle.tsx
@@ -5,10 +5,10 @@ import { VToolbarTitle } from '@/components/VToolbar'
 import { defineComponent } from '@/util'
 
 export const VAppBarTitle = defineComponent({
-  ...VToolbarTitle,
-
   name: 'VAppBarTitle',
 
+  props: { ...VToolbarTitle.props },
+
   setup (_, { slots }) {
     return () => (
       <VToolbarTitle
@@ -17,4 +17,4 @@ export const VAppBarTitle = defineComponent({
       />
     )
   },
-}) as typeof VToolbarTitle
+})
diff --git a/packages/vuetify/src/components/VSlider/VSliderTrack.tsx b/packages/vuetify/src/components/VSlider/VSliderTrack.tsx
@@ -82,6 +82,7 @@ export const VSliderTrack = defineComponent({
 
       return ticks.map((tick, index) => {
         const directionProperty = vertical.value ? 'bottom' : 'margin-inline-start'
+        const directionValue = (tick.position > 0 && tick.position < 100) ? convertToUnit(tick.position, '%') : undefined
         return (
           <div
             key={ tick.value }
@@ -91,9 +92,7 @@ export const VSliderTrack = defineComponent({
                 'v-slider-track__tick--filled': tick.position >= props.start && tick.position <= props.stop,
               },
             ]}
-            style={{
-              [directionProperty]: (tick.position > 0 && tick.position < 100) && convertToUnit(tick.position, '%'),
-            }}
+            style={{ [directionProperty]: directionValue }}
           >
             {
               (tick.label || slots['tick-label']) && (

diff --git a/packages/vuetify/src/composables/layout.ts b/packages/vuetify/src/composables/layout.ts
@@ -2,11 +2,21 @@
 import { useResizeObserver } from '@/composables/resizeObserver'
 
 // Utilities
-import { computed, inject, onActivated, onBeforeUnmount, onDeactivated, onMounted, provide, reactive, ref } from 'vue'
+import {
+  computed,
+  inject,
+  onActivated,
+  onBeforeUnmount,
+  onDeactivated,
+  onMounted,
+  provide,
+  reactive,
+  ref,
+} from 'vue'
 import { convertToUnit, findChildrenWithProvide, getCurrentInstance, getUid, propsFactory } from '@/util'
 
 // Types
-import type { ComponentInternalInstance, InjectionKey, Prop, Ref } from 'vue'
+import type { ComponentInternalInstance, CSSProperties, InjectionKey, Prop, Ref } from 'vue'
 
 type Position = 'top' | 'left' | 'right' | 'bottom'
 
@@ -33,12 +43,12 @@ interface LayoutProvide {
       absolute: Ref<boolean | undefined>
     }
   ) => {
-    layoutItemStyles: Ref<Record<string, unknown>>
-    layoutItemScrimStyles: Ref<Record<string, unknown>>
+    layoutItemStyles: Ref<CSSProperties>
+    layoutItemScrimStyles: Ref<CSSProperties>
     zIndex: Ref<number>
   }
   unregister: (id: string) => void
-  mainStyles: Ref<Record<string, unknown>>
+  mainStyles: Ref<CSSProperties>
   getLayoutItem: (id: string) => LayoutItem | undefined
   items: Ref<LayoutItem[]>
   layoutRect: Ref<DOMRectReadOnly | undefined>
@@ -192,7 +202,7 @@ export function createLayout (props: { overlaps?: string[], fullHeight?: boolean
     return !Array.from(disabledTransitions.values()).some(ref => ref.value)
   })
 
-  const mainStyles = computed(() => {
+  const mainStyles = computed<CSSProperties>(() => {
     const layer = layers.value[layers.value.length - 1].layer
 
     return {
@@ -258,7 +268,7 @@ export function createLayout (props: { overlaps?: string[], fullHeight?: boolean
       const index = computed(() => items.value.findIndex(i => i.id === id))
       const zIndex = computed(() => rootZIndex.value + (layers.value.length * 2) - (index.value * 2))
 
-      const layoutItemStyles = computed(() => {
+      const layoutItemStyles = computed<CSSProperties>(() => {
         const isHorizontal = position.value === 'left' || position.value === 'right'
         const isOppositeHorizontal = position.value === 'right'
         const isOppositeVertical = position.value === 'bottom'
@@ -269,7 +279,7 @@ export function createLayout (props: { overlaps?: string[], fullHeight?: boolean
           transform: `translate${isHorizontal ? 'X' : 'Y'}(${(active.value ? 0 : -110) * (isOppositeHorizontal || isOppositeVertical ? -1 : 1)}%)`,
           position: absolute.value || rootZIndex.value !== ROOT_ZINDEX ? 'absolute' : 'fixed',
           ...(transitionsEnabled.value ? undefined : { transition: 'none' }),
-        }
+        } as const
 
         if (!isMounted.value) return styles
 
@@ -295,7 +305,7 @@ export function createLayout (props: { overlaps?: string[], fullHeight?: boolean
         }
       })
 
-      const layoutItemScrimStyles = computed(() => ({
+      const layoutItemScrimStyles = computed<CSSProperties>(() => ({
         zIndex: zIndex.value - 1,
         position: rootZIndex.value === ROOT_ZINDEX ? 'fixed' : 'absolute',
       }))