@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/util/legacyEventsMixin.ts

@@ -3,32 +3,32 @@
 
 export const legacyEventsMixin = {
   methods: {
-    $emitLegacy (eventName: string, args?: any) {
+    $emitLegacy (this: any, eventName: string, args?: any) {
       if (!this.eventsLegacy || !this.eventsLegacy[eventName]) return
 
       this.eventsLegacy[eventName].forEach((listener: Function) => listener(args))
     },
-    $on (eventName: string, listener: Function) {
+    $on (this: any, eventName: string, listener: Function) {
       this.eventsLegacy ||= {}
       this.eventsLegacy[eventName] ||= []
       this.eventsLegacy[eventName].push(listener)
       // console.warn("$on is not available")
     },
-    $off (eventName: string, listener: Function) {
+    $off (this: any, eventName: string, listener: Function) {
       if (this.eventsLegacy && this.eventsLegacy[eventName]) {
         this.eventsLegacy[eventName] = this.eventsLegacy[eventName].filter((_listener: Function) => _listener !== listener)
       }
       // console.warn('$off is not available')
-    },
+    }
   },
   computed: {
-    $listeners () {
-      const names = Object.keys(this.$attrs).filter(name => name.startsWith('on'))
+    $listeners (this: any): Record<string, unknown> {
+      const names = Object.keys(this.$attrs).filter((name: string) => name.startsWith('on'))
 
-      return names.reduce((listeners, name) => {
+      return names.reduce((listeners: Record<string, unknown>, name: string) => {
         listeners[name] = this.$attrs[name]
         return listeners
       }, {})
-    },
-  },
+    }
+  }
 }

package/src/util/make-directive-activatable.ts

@@ -1,42 +1,42 @@
-export default (directive) => {
+export default (directive: Record<string, any>) => {
   const activeMap = new WeakMap()
 
-  const {mounted, unmounted, updated} = directive
+  const { mounted, unmounted, updated } = directive
 
-  const wrappedMounted = (...args) => {
+  const wrappedMounted = (...args: any[]) => {
     const binding = args[1]
 
     activeMap.set(args[0], binding.value.isDirActive)
 
-    if(binding.value.isDirActive === false) return
+    if (binding.value.isDirActive === false) return
 
     mounted(...args)
   }
 
-  const wrappedUnmounted = (...args) => {
+  const wrappedUnmounted = (...args: any[]) => {
     const binding = args[1]
 
     activeMap.set(args[0], binding.value.isDirActive)
 
-    if(binding.value.isDirActive === false) return
+    if (binding.value.isDirActive === false) return
 
     unmounted(...args)
   }
 
-  const wrappedUpdated = (...args) => {
+  const wrappedUpdated = (...args: any[]) => {
     const isDirActive = activeMap.get(args[0])
 
-    if(isDirActive === undefined) return updated(...args)
+    if (isDirActive === undefined) return updated(...args)
 
     const binding = args[1]
 
-    if(!isDirActive && binding.value.isDirActive) {
+    if (!isDirActive && binding.value.isDirActive) {
       mounted(...args)
       activeMap.set(args[0], binding.value.isDirActive)
       return
     }
 
-    if(isDirActive && !binding.value.isDirActive) {
+    if (isDirActive && !binding.value.isDirActive) {
       unmounted(...args)
       activeMap.set(args[0], binding.value.isDirActive)
       return
@@ -50,6 +50,6 @@ export default (directive) => {
       mounted: wrappedMounted,
       unmounted: wrappedUnmounted,
       updated: wrappedUpdated
-    }).filter(([name, fn]) => directive[name])
+    }).filter(([name, fn]) => directive[name] && fn)
   )
-}
+}

package/src/util/mergeData.ts

@@ -4,12 +4,12 @@
  * @see https://github.com/alexsasharegan/vue-functional-data-merge
  */
 /* eslint-disable max-statements */
-import { VNodeData } from 'vue'
+import type { VNodeData } from '../types/vue-internal'
 import { camelize, wrapInArray } from './helpers'
 
 const pattern = {
   styleList: /;(?![^(]*\))/g,
-  styleProp: /:(.*)/,
+  styleProp: /:(.*)/
 } as const
 
 function parseStyle (style: string) {
@@ -60,20 +60,6 @@ export default function mergeData (): VNodeData {
             mergeTarget[prop] = mergeStyles(mergeTarget[prop], arguments[i][prop])
           }
           break
-        // Space delimited string concatenation strategy
-        case 'class':
-          if (!arguments[i][prop]) {
-            break
-          }
-          if (mergeTarget[prop] === undefined) {
-            mergeTarget[prop] = ''
-          }
-          if (mergeTarget[prop]) {
-            // Not an empty string, so concatenate
-            mergeTarget[prop] += ' '
-          }
-          mergeTarget[prop] += arguments[i][prop].trim()
-          break
         // Object, the properties of which to merge via array merge strategy (array concatenation).
         // Callback merge strategy merges callbacks to the beginning of the array,
         // so that the last defined callback will be invoked first.

package/src/util/mixins.ts

@@ -1,16 +1,18 @@
 /* eslint-disable max-len, import/export, no-use-before-define */
 import { Component, defineComponent } from 'vue'
 
-export default function mixins<T extends Component[]> (...args: T): ExtractVue<T> extends infer V ? V extends Component ? Component<V> : never : never
-export default function mixins<T extends Component> (...args: Component[]): Component<T>
-export default function mixins (...args: Component[]) {
+export interface MixinBuilder {
+  extend: (options: Record<string, any>) => ReturnType<typeof defineComponent>
+}
+
+export default function mixins (...args: Component[]): MixinBuilder {
   return {
-    extend (options) {
+    extend (options: Record<string, any>) {
       return defineComponent({
-        mixins: args,
-        ...options,
-      })
-    },
+        mixins: args as any,
+        ...options
+      }) as ReturnType<typeof defineComponent>
+    }
   }
 }
 

package/src/util/rebuildFunctionalSlots.ts

@@ -1,4 +1,4 @@
-import { CreateElement, VNode } from 'vue'
+import type { CreateElement, VNode } from '../types/vue-internal'
 
 export default function rebuildFunctionalSlots (slots: { [key: string]: VNode[] | undefined }, h: CreateElement) {
   const children: VNode[] = []

package/types/alacarte.d.ts

@@ -1,7 +1,8 @@
 declare module 'vuetify/es5/install' {
-  import { Component } from 'vue'
+  import type { App } from 'vue'
+  import type { VuetifyUseOptions } from 'vuetify'
 
-  const install: (Vue: Component, args: {}) => void
+  const install: (app: App, args?: VuetifyUseOptions) => void
 
   export { install }
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import Vue, { Component, PluginFunction, Directive, VNode } from 'vue'
+import type { App, Component, Directive, VNode } from 'vue'
 import './lib'
 import './alacarte'
 import './colors'
@@ -21,7 +21,7 @@ import { GoToOptions, VuetifyGoToTarget } from './services/goto'
 export default class Vuetify {
   constructor (preset?: Partial<UserVuetifyPreset>)
 
-  static install: PluginFunction<VuetifyUseOptions>
+  static install: (app: App, options?: VuetifyUseOptions) => void
   static version: string
   static config: Config
 
@@ -57,20 +57,12 @@ export interface Framework {
   rtl: boolean
 }
 
-declare module 'vue/types/vue' {
-  export interface Vue {
+declare module '@vue/runtime-core' {
+  interface ComponentCustomProperties {
     $vuetify: Framework
   }
-}
 
-declare module 'vue/types/options' {
-  export interface ComponentOptions<
-    V extends Vue,
-    Data=any,
-    Methods=any,
-    Computed=any,
-    PropsDef=any,
-    Props=any> {
+  interface ComponentCustomOptions {
     vuetify?: Vuetify
   }
 }

package/types/services/goto.d.ts

@@ -1,7 +1,7 @@
 // Types
-import Vue from 'vue'
+import type { ComponentPublicInstance } from 'vue'
 
-export type VuetifyGoToTarget = number | string | HTMLElement | Vue
+export type VuetifyGoToTarget = number | string | HTMLElement | ComponentPublicInstance
 
 export type VuetifyGoToEasing =
   ((t: number) => number) |
@@ -20,7 +20,7 @@ export type VuetifyGoToEasing =
   'easeInOutQuint'
 
 export interface GoToOptions {
-  container?: string | HTMLElement | Vue
+  container?: string | HTMLElement | ComponentPublicInstance
   duration?: number
   offset?: number
   easing?: VuetifyGoToEasing

package/types/services/index.d.ts

@@ -1,11 +1,11 @@
 // Types
-import Vue from 'vue'
+import type { ComponentPublicInstance } from 'vue'
 import Framework from '../'
 import { VuetifyPreset } from 'vuetify/types/services/presets'
 
 export interface VuetifyServiceContract {
   framework: Record<string, VuetifyServiceContract>
-  init: (root: Vue, ssrContext?: object) => void
+  init: (root: ComponentPublicInstance, ssrContext?: object) => void
 }
 
 export interface VuetifyService {