@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/services/icons/presets/md.ts

@@ -33,7 +33,7 @@ const icons: VuetifyIcons = {
   unfold: 'unfold_more',
   file: 'attach_file',
   plus: 'add',
-  minus: 'remove',
+  minus: 'remove'
 }
 
 export default icons

package/src/services/icons/presets/mdi-svg.ts

@@ -33,7 +33,7 @@ const icons: VuetifyIcons = {
   unfold: 'M12,18.17L8.83,15L7.42,16.41L12,21L16.59,16.41L15.17,15M12,5.83L15.17,9L16.58,7.59L12,3L7.41,7.59L8.83,9L12,5.83Z',
   file: 'M16.5,6V17.5C16.5,19.71 14.71,21.5 12.5,21.5C10.29,21.5 8.5,19.71 8.5,17.5V5C8.5,3.62 9.62,2.5 11,2.5C12.38,2.5 13.5,3.62 13.5,5V15.5C13.5,16.05 13.05,16.5 12.5,16.5C11.95,16.5 11.5,16.05 11.5,15.5V6H10V15.5C10,16.88 11.12,18 12.5,18C13.88,18 15,16.88 15,15.5V5C15,2.79 13.21,1 11,1C8.79,1 7,2.79 7,5V17.5C7,20.54 9.46,23 12.5,23C15.54,23 18,20.54 18,17.5V6H16.5Z',
   plus: 'M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z',
-  minus: 'M19,13H5V11H19V13Z',
+  minus: 'M19,13H5V11H19V13Z'
 }
 
 export default icons

package/src/services/icons/presets/mdi.ts

@@ -33,7 +33,7 @@ const icons: VuetifyIcons = {
   unfold: 'mdi-unfold-more-horizontal',
   file: 'mdi-paperclip',
   plus: 'mdi-plus',
-  minus: 'mdi-minus',
+  minus: 'mdi-minus'
 }
 
 export default icons

package/src/services/lang/__tests__/lang.spec.ts

@@ -36,9 +36,9 @@ describe('$vuetify.lang', () => {
       lang: {
         current: 'foreign',
         locales: {
-          foreign: { foo: 'foreignBar' },
-        },
-      },
+          foreign: { foo: 'foreignBar' }
+        }
+      }
     })
 
     expect(lang.t('$vuetify.foo')).toBe('foreignBar')
@@ -49,7 +49,7 @@ describe('$vuetify.lang', () => {
 
     lang = new Lang({
       ...preset,
-      lang: { t: translator },
+      lang: { t: translator }
     })
 
     lang.t('$vuetify.foobar', 'fizzbuzz')
@@ -60,7 +60,7 @@ describe('$vuetify.lang', () => {
   it('should replace params on a non-prefixed key', () => {
     lang = new Lang({
       ...preset,
-      lang: { t: str => str },
+      lang: { t: str => str }
     })
 
     const translated = lang.t('{2} bar {0} foo {1}', 'hello', 'world', '!')

package/src/services/lang/index.ts

@@ -9,7 +9,7 @@ import { consoleError, consoleWarn } from '../../util/console'
 import { VuetifyPreset } from 'vuetify/types/services/presets'
 import {
   VuetifyLocale,
-  Lang as ILang,
+  Lang as ILang
 } from 'vuetify/types/services/lang'
 
 const LANG_PREFIX = '$vuetify.'
@@ -54,7 +54,7 @@ export class Lang extends Service implements ILang {
     const {
       current,
       locales,
-      t,
+      t
     } = preset[Lang.property]
 
     this.current = current

package/src/services/presets/__tests__/presets.spec.ts

@@ -10,19 +10,19 @@ describe('$vuetify.presets', () => {
     const vuetify = new Framework({
       rtl: true,
       breakpoint: {
-        thresholds: { xs: 200 },
+        thresholds: { xs: 200 }
       },
       icons: {
         iconfont: 'md',
-        values: { complete: 'bar' },
+        values: { complete: 'bar' }
       },
       lang: {
         locales: {
           en: {
             badge: 'Foobar',
-            dataIterator: { noResultsText: 'Fizzbuzz' },
-          },
-        },
+            dataIterator: { noResultsText: 'Fizzbuzz' }
+          }
+        }
       },
       theme: {
         dark: true,
@@ -30,10 +30,10 @@ describe('$vuetify.presets', () => {
           light: {
             primary: 'blue',
             // https://github.com/vuetifyjs/vuetify/issues/10100
-            secondary: { darken4: 'red' },
-          },
-        },
-      },
+            secondary: { darken4: 'red' }
+          }
+        }
+      }
     })
 
     expect(JSON.stringify(vuetify.preset)).toMatchSnapshot()

package/src/services/presets/index.ts

@@ -10,7 +10,7 @@ import Vuetify from 'vuetify/types'
 import { Service } from '../service'
 import {
   UserVuetifyPreset,
-  VuetifyPreset,
+  VuetifyPreset
 } from 'vuetify/types/services/presets'
 
 export class Presets extends Service {
@@ -18,7 +18,7 @@ export class Presets extends Service {
 
   constructor (
     parentPreset: Partial<UserVuetifyPreset>,
-    parent: Vuetify,
+    parent: Vuetify
   ) {
     super()
 

package/src/services/service/index.ts

@@ -2,10 +2,10 @@
 import { VuetifyServiceContract } from 'vuetify/types/services/index'
 
 // Types
-import Vue from 'vue'
+import type { ComponentPublicInstance } from 'vue'
 
 export class Service implements VuetifyServiceContract {
   framework = {}
 
-  init (root: Vue, ssrContext?: object) {}
+  init (root: ComponentPublicInstance, ssrContext?: object) {}
 }

package/src/services/theme/__tests__/theme-utils.spec.ts

@@ -1,6 +1,6 @@
 import {
   genStyles,
-  parse,
+  parse
 } from '../utils'
 
 describe('theme-utilities.ts', () => {
@@ -18,16 +18,16 @@ describe('theme-utilities.ts', () => {
         darken1: '#0169dc',
         darken2: '#c28fd0',
         darken3: '#fbe002',
-        darken4: '#33303a',
+        darken4: '#33303a'
       },
-      anchor: '#c42742',
+      anchor: '#c42742'
     }
   })
 
   it('should parse a theme or theme item', () => {
     const theme = {
       primary: '#000',
-      secondary: '#fff',
+      secondary: '#fff'
     }
 
     expect(parse(theme)).toMatchSnapshot()

package/src/services/theme/__tests__/theme.spec.ts

@@ -12,7 +12,7 @@ import { createApp, nextTick } from 'vue'
 import {
   VuetifyParsedTheme,
   VuetifyThemeVariant,
-  ThemeOptions,
+  ThemeOptions
 } from 'vuetify/types/services/theme'
 
 // Test Utils
@@ -27,7 +27,7 @@ const FillVariant = (variant: Partial<VuetifyThemeVariant> = {}) => {
     info: '#2196F3',
     success: '#4CAF50',
     warning: '#FFC107',
-    ...variant,
+    ...variant
   }
 }
 
@@ -38,9 +38,9 @@ describe('Theme.ts', () => {
         default: 'light',
         themes: {
           dark: FillVariant(),
-          light: FillVariant(),
-        },
-      },
+          light: FillVariant()
+        }
+      }
     })
   }
 
@@ -83,9 +83,9 @@ describe('Theme.ts', () => {
         light: FillVariant({
           primary: '#000001',
           secondary: '#000002',
-          accent: '#000003',
-        }),
-      },
+          accent: '#000003'
+        })
+      }
     })
 
     // Принудительно создаем стиль элемент для тестов
@@ -110,9 +110,9 @@ describe('Theme.ts', () => {
       themes: {
         light: FillVariant(),
         dark: FillVariant({
-          primary: '#FFFFFF',
-        }),
-      },
+          primary: '#FFFFFF'
+        })
+      }
     })
 
     // Принудительно создаем стиль элемент для тестов
@@ -152,11 +152,11 @@ describe('Theme.ts', () => {
       get: jest.fn(theme => cache.get(theme)),
       set: jest.fn((theme: VuetifyParsedTheme, css: string) => {
         cache.set(theme, css)
-      }),
+      })
     }
 
     const theme = mockTheme({
-      options: { themeCache },
+      options: { themeCache }
     })
 
     expect(theme.generatedStyles).toMatchSnapshot()
@@ -174,7 +174,7 @@ describe('Theme.ts', () => {
     const minifyTheme = jest.fn((css: string) => css + 'foobar')
 
     const theme = mockTheme({
-      options: { minifyTheme },
+      options: { minifyTheme }
     })
 
     // Принудительно создаем стиль элемент для тестов
@@ -192,7 +192,7 @@ describe('Theme.ts', () => {
 
   it('should add nonce to stylesheet', () => {
     const theme = mockTheme({
-      options: { cspNonce: 'foobar' },
+      options: { cspNonce: 'foobar' }
     })
 
     // Принудительно создаем стиль элемент для тестов

package/src/services/theme/index.ts

@@ -7,13 +7,14 @@ import * as ThemeUtils from './utils'
 import { getNestedValue } from '../../util/helpers'
 
 // Types
-import {App, reactive} from 'vue'
+import { reactive } from 'vue'
+import type { ComponentPublicInstance } from 'vue'
 import { VuetifyPreset } from 'vuetify/types/services/presets'
 import {
   VuetifyParsedTheme,
   VuetifyThemes,
   VuetifyThemeVariant,
-  Theme as ITheme,
+  Theme as ITheme
 } from 'vuetify/types/services/theme'
 
 // Vue Meta 3
@@ -45,7 +46,7 @@ export class Theme extends Service {
       dark,
       disable,
       options,
-      themes,
+      themes
     } = preset[Theme.property]
 
     this.dark = Boolean(dark)
@@ -60,7 +61,7 @@ export class Theme extends Service {
 
     this.themes = {
       dark: this.fillVariant(themes.dark, true),
-      light: this.fillVariant(themes.light, false),
+      light: this.fillVariant(themes.light, false)
     }
   }
 
@@ -102,7 +103,7 @@ export class Theme extends Service {
   // Initialize theme for SSR and SPA
   // Attach to ssrContext head or
   // apply new theme to document
-  public init (root: App, ssrContext?: any): void {
+  public init (root: ComponentPublicInstance, ssrContext?: any): void {
     if (this.disabled) return
 
     // Инициализируем vue-meta 3
@@ -170,7 +171,7 @@ export class Theme extends Service {
     document.head.appendChild(this.styleEl)
   }
 
-  private initVueMeta3 (root: App) {
+  private initVueMeta3 (_root: ComponentPublicInstance) {
     // Vue Meta 3 теперь работает через плагин, а не через отдельный manager
     // Стили будут добавляться напрямую через useMeta API в компонентах
     // или через обычный DOM API
@@ -190,7 +191,7 @@ export class Theme extends Service {
     ssrContext.head += `<style type="text/css" id="vuetify-theme-stylesheet"${nonce}>${this.generatedStyles}</style>`
   }
 
-  private initTheme (root: App) {
+  private initTheme (_root: ComponentPublicInstance) {
     // Only watch for reactivity on client side
     if (typeof document === 'undefined') return
 
@@ -209,7 +210,6 @@ export class Theme extends Service {
     //   this.unwatch = root.$watch(() => obs.themes, () => this.applyTheme(), { deep: true })
     // })
 
-
     this.applyTheme()
   }
 

package/src/services/theme/utils.ts

@@ -4,13 +4,13 @@ import * as sRGB from '../../util/color/transformSRGB'
 import * as LAB from '../../util/color/transformCIELAB'
 import {
   VuetifyParsedTheme,
-  VuetifyThemeItem,
+  VuetifyThemeItem
 } from 'vuetify/types/services/theme'
 
 export function parse (
   theme: Record<string, VuetifyThemeItem>,
   isItem = false,
-  variations = true,
+  variations = true
 ): VuetifyParsedTheme {
   const { anchor, ...variant } = theme
   const colors = Object.keys(variant)
@@ -118,7 +118,7 @@ export function genStyles (theme: VuetifyParsedTheme, cssVar = false): string {
 
 export function genVariations (name: string, value: ColorInt): Record<string, string> {
   const values: Record<string, string> = {
-    base: intToHex(value),
+    base: intToHex(value)
   }
 
   for (let i = 5; i > 0; --i) {

package/src/types/vue-augment.ts

@@ -0,0 +1,15 @@
+/**
+ * Внутренности рендера/директив (ctx и т.д.) — не публичный API Vue.
+ */
+import 'vue'
+
+declare module 'vue' {
+  export interface VNode {
+    ctx?: any
+    componentInstance?: any
+  }
+
+  export interface App {
+    $_vuetify_installed?: boolean
+  }
+}

package/src/types/vue-internal.ts

@@ -0,0 +1,34 @@
+/**
+ * Внутренние типы рендера Vuetify (mergeData, h, директивы).
+ * Явные импорты вместо дополнения модуля `vue`.
+ */
+import type { Component, DirectiveBinding, VNode, VNodeArrayChildren, VNodeChild } from 'vue'
+
+export type { VNode }
+
+/** Объект данных для mergeData / второго аргумента h() в legacy-gen* */
+export interface VNodeData {
+  [key: string]: any
+  model?: {
+    callback: (v: any) => void
+    expression: string
+    value: any
+  }
+}
+
+export type CreateElement = (
+  type: any,
+  props?: VNodeData | null,
+  children?: any
+) => VNode
+
+export type VNodeDirective = DirectiveBinding
+
+export type VNodeChildren = VNodeChild
+export type VNodeChildrenArrayContents = VNodeArrayChildren
+
+/** Объекты переходов с `functional: true` до полного перевода на функциональный API Vue 3 */
+export type FunctionalComponentOptions = Component
+
+/** Аналог старых PropOptions для reduce-конфигов пропсов в VGrid */
+export type PropOptions = Record<string, any>

package/src/util/__tests__/colorUtils.spec.ts

@@ -3,7 +3,7 @@ import {
   colorToInt,
   intToHex,
   isCssColor,
-  parseGradient,
+  parseGradient
 } from '../colorUtils'
 import * as transformSRGB from '../color/transformSRGB'
 import * as transformCIELAB from '../color/transformCIELAB'
@@ -11,8 +11,8 @@ import * as transformCIELAB from '../color/transformCIELAB'
 const colors = {
   red: {
     base: '#ff0000',
-    lighten1: '#ff6666',
-  },
+    lighten1: '#ff6666'
+  }
 }
 const currentTheme = { primary: '#1976d2' }
 
@@ -158,5 +158,5 @@ expect.extend({
     expect(round(received)).toEqual(expected)
 
     return { pass: true }
-  },
+  }
 })

package/src/util/__tests__/dateTimeUtils.spec.ts

@@ -17,7 +17,7 @@ describe('/util/dateTimeUtils.ts', () => {
     // ISO 8601 (first day of week Monday, First week of year must contain a thurstday)
     [2012, 0, 1, 1, 4, 52],
     // American locale (first day of week Sunday, 1 Jan determines first week)
-    [2012, 0, 1, 0, 0, 1],
+    [2012, 0, 1, 0, 0, 1]
   ])('should return correct weeknumber', (year, month, day, firstDayOfWeek, localFirstDayOfYear, week) => {
     expect(weekNumber(year, month, day, firstDayOfWeek, localFirstDayOfYear)).toBe(week)
   })

package/src/util/__tests__/dom.spec.ts

@@ -1,16 +1,16 @@
 import { defineComponent, h } from 'vue'
 import {
   mount,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import {
-  attachedRoot,
+  attachedRoot
 } from '../dom'
 
 const FooComponent = defineComponent({
   render () {
     return h('div', ['foo'])
-  },
+  }
 })
 
 describe('dom', () => {