@dimailn/vuetify 2.7.2-alpha4 → 2.7.2-alpha41

package/lib/util/mergeData.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/mergeData.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @copyright 2017 Alex Regan\n * @license MIT\n * @see https://github.com/alexsasharegan/vue-functional-data-merge\n */\n/* eslint-disable max-statements */\nimport { VNodeData } from 'vue'\nimport { camelize, wrapInArray } from './helpers'\n\nconst pattern = {\n  styleList: /;(?![^(]*\\))/g,\n  styleProp: /:(.*)/,\n} as const\n\nfunction parseStyle (style: string) {\n  const styleMap: Dictionary<any> = {}\n\n  for (const s of style.split(pattern.styleList)) {\n    let [key, val] = s.split(pattern.styleProp)\n    key = key.trim()\n    if (!key) {\n      continue\n    }\n    // May be undefined if the `key: value` pair is incomplete.\n    if (typeof val === 'string') {\n      val = val.trim()\n    }\n    styleMap[camelize(key)] = val\n  }\n\n  return styleMap\n}\n\n/**\n * Intelligently merges data for createElement.\n * Merges arguments left to right, preferring the right argument.\n * Returns new VNodeData object.\n */\nexport default function mergeData (...vNodeData: VNodeData[]): VNodeData\nexport default function mergeData (): VNodeData {\n  const mergeTarget: VNodeData & Dictionary<any> = {}\n  let i: number = arguments.length\n  let prop: string\n\n  // Allow for variadic argument length.\n  while (i--) {\n    // Iterate through the data properties and execute merge strategies\n    // Object.keys eliminates need for hasOwnProperty call\n    for (prop of Object.keys(arguments[i])) {\n      switch (prop) {\n        // Array merge strategy (array concatenation)\n        case 'class':\n        case 'directives':\n          if (arguments[i][prop]) {\n            mergeTarget[prop] = mergeClasses(mergeTarget[prop], arguments[i][prop])\n          }\n          break\n        case 'style':\n          if (arguments[i][prop]) {\n            mergeTarget[prop] = mergeStyles(mergeTarget[prop], arguments[i][prop])\n          }\n          break\n        // Space delimited string concatenation strategy\n        case 'class':\n          if (!arguments[i][prop]) {\n            break\n          }\n          if (mergeTarget[prop] === undefined) {\n            mergeTarget[prop] = ''\n          }\n          if (mergeTarget[prop]) {\n            // Not an empty string, so concatenate\n            mergeTarget[prop] += ' '\n          }\n          mergeTarget[prop] += arguments[i][prop].trim()\n          break\n        // Object, the properties of which to merge via array merge strategy (array concatenation).\n        // Callback merge strategy merges callbacks to the beginning of the array,\n        // so that the last defined callback will be invoked first.\n        // This is done since to mimic how Object.assign merging\n        // uses the last given value to assign.\n        case 'on':\n        case 'nativeOn':\n          if (arguments[i][prop]) {\n            mergeTarget[prop] = mergeListeners(mergeTarget[prop], arguments[i][prop])\n          }\n          break\n        // Object merge strategy\n        case 'attrs':\n        case 'props':\n        case 'domProps':\n        case 'scopedSlots':\n        case 'staticStyle':\n        case 'hook':\n        case 'transition':\n          if (!arguments[i][prop]) {\n            break\n          }\n          if (!mergeTarget[prop]) {\n            mergeTarget[prop] = {}\n          }\n          mergeTarget[prop] = { ...arguments[i][prop], ...mergeTarget[prop] }\n          break\n        // Reassignment strategy (no merge)\n        default: // slot, key, ref, tag, show, keepAlive\n          if (!mergeTarget[prop]) {\n            mergeTarget[prop] = arguments[i][prop]\n          }\n      }\n    }\n  }\n\n  return mergeTarget\n}\n\nexport function mergeStyles (\n  target: undefined | string | object[] | object,\n  source: undefined | string | object[] | object\n) {\n  if (!target) return source\n  if (!source) return target\n\n  target = wrapInArray(typeof target === 'string' ? parseStyle(target) : target)\n\n  return (target as object[]).concat(typeof source === 'string' ? parseStyle(source) : source)\n}\n\nexport function mergeClasses (target: any, source: any) {\n  if (!source) return target\n  if (!target) return source\n\n  return target ? wrapInArray(target).concat(source) : source\n}\n\nexport function mergeListeners (...args: [\n  { [key: string]: Function | Function[] } | undefined,\n  { [key: string]: Function | Function[] } | undefined\n]) {\n  if (!args[0]) return args[1]\n  if (!args[1]) return args[0]\n\n  const dest: { [key: string]: Function | Function[] } = {}\n\n  for (let i = 2; i--;) {\n    const arg = args[i]\n    for (const event in arg) {\n      if (!arg[event]) continue\n\n      if (dest[event]) {\n        // Merge current listeners before (because we are iterating backwards).\n        // Note that neither \"target\" or \"source\" must be altered.\n        dest[event] = ([] as Function[]).concat(arg[event], dest[event])\n      } else {\n        // Straight assign.\n        dest[event] = arg[event]\n      }\n    }\n  }\n\n  return dest\n}\n"],"sourceRoot":"","file":"mergeData.js"}
+{"version":3,"sources":["../../src/util/mergeData.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @copyright 2017 Alex Regan\n * @license MIT\n * @see https://github.com/alexsasharegan/vue-functional-data-merge\n */\n/* eslint-disable max-statements */\nimport type { VNodeData } from '../types/vue-internal'\nimport { camelize, wrapInArray } from './helpers'\n\nconst pattern = {\n  styleList: /;(?![^(]*\\))/g,\n  styleProp: /:(.*)/\n} as const\n\nfunction parseStyle (style: string) {\n  const styleMap: Dictionary<any> = {}\n\n  for (const s of style.split(pattern.styleList)) {\n    let [key, val] = s.split(pattern.styleProp)\n    key = key.trim()\n    if (!key) {\n      continue\n    }\n    // May be undefined if the `key: value` pair is incomplete.\n    if (typeof val === 'string') {\n      val = val.trim()\n    }\n    styleMap[camelize(key)] = val\n  }\n\n  return styleMap\n}\n\n/**\n * Intelligently merges data for createElement.\n * Merges arguments left to right, preferring the right argument.\n * Returns new VNodeData object.\n */\nexport default function mergeData (...vNodeData: VNodeData[]): VNodeData\nexport default function mergeData (): VNodeData {\n  const mergeTarget: VNodeData & Dictionary<any> = {}\n  let i: number = arguments.length\n  let prop: string\n\n  // Allow for variadic argument length.\n  while (i--) {\n    // Iterate through the data properties and execute merge strategies\n    // Object.keys eliminates need for hasOwnProperty call\n    for (prop of Object.keys(arguments[i])) {\n      switch (prop) {\n        // Array merge strategy (array concatenation)\n        case 'class':\n        case 'directives':\n          if (arguments[i][prop]) {\n            mergeTarget[prop] = mergeClasses(mergeTarget[prop], arguments[i][prop])\n          }\n          break\n        case 'style':\n          if (arguments[i][prop]) {\n            mergeTarget[prop] = mergeStyles(mergeTarget[prop], arguments[i][prop])\n          }\n          break\n        // Object, the properties of which to merge via array merge strategy (array concatenation).\n        // Callback merge strategy merges callbacks to the beginning of the array,\n        // so that the last defined callback will be invoked first.\n        // This is done since to mimic how Object.assign merging\n        // uses the last given value to assign.\n        case 'on':\n        case 'nativeOn':\n          if (arguments[i][prop]) {\n            mergeTarget[prop] = mergeListeners(mergeTarget[prop], arguments[i][prop])\n          }\n          break\n        // Object merge strategy\n        case 'attrs':\n        case 'props':\n        case 'domProps':\n        case 'scopedSlots':\n        case 'staticStyle':\n        case 'hook':\n        case 'transition':\n          if (!arguments[i][prop]) {\n            break\n          }\n          if (!mergeTarget[prop]) {\n            mergeTarget[prop] = {}\n          }\n          mergeTarget[prop] = { ...arguments[i][prop], ...mergeTarget[prop] }\n          break\n        // Reassignment strategy (no merge)\n        default: // slot, key, ref, tag, show, keepAlive\n          if (!mergeTarget[prop]) {\n            mergeTarget[prop] = arguments[i][prop]\n          }\n      }\n    }\n  }\n\n  return mergeTarget\n}\n\nexport function mergeStyles (\n  target: undefined | string | object[] | object,\n  source: undefined | string | object[] | object\n) {\n  if (!target) return source\n  if (!source) return target\n\n  target = wrapInArray(typeof target === 'string' ? parseStyle(target) : target)\n\n  return (target as object[]).concat(typeof source === 'string' ? parseStyle(source) : source)\n}\n\nexport function mergeClasses (target: any, source: any) {\n  if (!source) return target\n  if (!target) return source\n\n  return target ? wrapInArray(target).concat(source) : source\n}\n\nexport function mergeListeners (...args: [\n  { [key: string]: Function | Function[] } | undefined,\n  { [key: string]: Function | Function[] } | undefined\n]) {\n  if (!args[0] && !args[1]) return undefined\n\n  const dest: { [key: string]: Function | Function[] } = {}\n\n  for (let i = 2; i--;) {\n    const arg = args[i]\n    if (!arg) continue\n\n    for (const event in arg) {\n      if (!arg[event]) continue\n\n      const vueEventName = event.startsWith('on') && event.length > 2 && event.charAt(2) === event.charAt(2).toUpperCase()\n        ? event\n        : `on${event.charAt(0).toUpperCase() + event.slice(1)}`\n\n      if (dest[vueEventName]) {\n        // Merge current listeners before (because we are iterating backwards).\n        // Note that neither \"target\" or \"source\" must be altered.\n        dest[vueEventName] = ([] as Function[]).concat(arg[event], dest[vueEventName])\n      } else {\n        // Straight assign.\n        dest[vueEventName] = arg[event]\n      }\n    }\n  }\n\n  return dest\n}\n"],"sourceRoot":"","file":"mergeData.js"}

package/lib/util/mixins.js

@@ -1,11 +1,12 @@
 /* eslint-disable max-len, import/export, no-use-before-define */
+import { defineComponent } from 'vue';
 export default function mixins(...args) {
   return {
     extend(options) {
-      return {
+      return defineComponent({
         mixins: args,
         ...options
-      };
+      });
     }
 
   };

package/lib/util/mixins.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/mixins.ts"],"names":[],"mappings":"AAAA;AACA,eAAc,SAAU,MAAV,CAAkB,GAAG,IAArB,EAAyB;AACrC,SAAO;AACL,IAAA,MAAM,CAAC,OAAD,EAAQ;AACZ,aAAO;AACL,QAAA,MAAM,EAAE,IADH;AAEL,WAAG;AAFE,OAAP;AAID;;AANI,GAAP;AAQD","sourcesContent":["/* eslint-disable max-len, import/export, no-use-before-define */\nexport default function mixins (...args){\n  return {\n    extend(options) {\n      return {\n        mixins: args,\n        ...options\n      }\n    }\n  }\n}"],"sourceRoot":"","file":"mixins.js"}
+{"version":3,"sources":["../../src/util/mixins.ts"],"names":[],"mappings":"AAAA;AACA,SAAoB,eAApB,QAA2C,KAA3C;AAMA,eAAc,SAAU,MAAV,CAAkB,GAAG,IAArB,EAAsC;AAClD,SAAO;AACL,IAAA,MAAM,CAAE,OAAF,EAA8B;AAClC,aAAO,eAAe,CAAC;AACrB,QAAA,MAAM,EAAE,IADa;AAErB,WAAG;AAFkB,OAAD,CAAtB;AAID;;AANI,GAAP;AAQD","sourcesContent":["/* eslint-disable max-len, import/export, no-use-before-define */\nimport { Component, defineComponent } from 'vue'\n\nexport interface MixinBuilder {\n  extend: (options: Record<string, any>) => ReturnType<typeof defineComponent>\n}\n\nexport default function mixins (...args: Component[]): MixinBuilder {\n  return {\n    extend (options: Record<string, any>) {\n      return defineComponent({\n        mixins: args as any,\n        ...options\n      }) as ReturnType<typeof defineComponent>\n    }\n  }\n}\n\n/**\n * Returns the instance type from a Vue 3 Component\n * Useful for adding types when using mixins().extend()\n */\nexport type ExtractVue<T extends Component | Component[]> = T extends (infer U)[]\n  ? UnionToIntersection<\n    U extends Component<infer V> ? V : never\n  >\n  : T extends Component<infer V> ? V : never\n\ntype UnionToIntersection<U> =\n  (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never\n"],"sourceRoot":"","file":"mixins.js"}

package/lib/util/rebuildFunctionalSlots.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/rebuildFunctionalSlots.ts"],"names":[],"mappings":"AAEA,eAAc,SAAU,sBAAV,CAAkC,KAAlC,EAAiF,CAAjF,EAAiG;AAC7G,QAAM,QAAQ,GAAY,EAA1B;;AAEA,OAAK,MAAM,IAAX,IAAmB,KAAnB,EAA0B;AACxB,QAAI,KAAK,CAAC,cAAN,CAAqB,IAArB,CAAJ,EAAgC;AAC9B,MAAA,QAAQ,CAAC,IAAT,CAAc,CAAC,CAAC,UAAD,EAAa;AAAE,QAAA;AAAF,OAAb,EAAuB,KAAK,CAAC,IAAD,CAA5B,CAAf;AACD;AACF;;AAED,SAAO,QAAP;AACD","sourcesContent":["import { CreateElement, VNode } from 'vue'\n\nexport default function rebuildFunctionalSlots (slots: { [key: string]: VNode[] | undefined }, h: CreateElement) {\n  const children: VNode[] = []\n\n  for (const slot in slots) {\n    if (slots.hasOwnProperty(slot)) {\n      children.push(h('template', { slot }, slots[slot]))\n    }\n  }\n\n  return children\n}\n"],"sourceRoot":"","file":"rebuildFunctionalSlots.js"}
+{"version":3,"sources":["../../src/util/rebuildFunctionalSlots.ts"],"names":[],"mappings":"AAEA,eAAc,SAAU,sBAAV,CAAkC,KAAlC,EAAiF,CAAjF,EAAiG;AAC7G,QAAM,QAAQ,GAAY,EAA1B;;AAEA,OAAK,MAAM,IAAX,IAAmB,KAAnB,EAA0B;AACxB,QAAI,KAAK,CAAC,cAAN,CAAqB,IAArB,CAAJ,EAAgC;AAC9B,MAAA,QAAQ,CAAC,IAAT,CAAc,CAAC,CAAC,UAAD,EAAa;AAAE,QAAA;AAAF,OAAb,EAAuB,KAAK,CAAC,IAAD,CAA5B,CAAf;AACD;AACF;;AAED,SAAO,QAAP;AACD","sourcesContent":["import type { CreateElement, VNode } from '../types/vue-internal'\n\nexport default function rebuildFunctionalSlots (slots: { [key: string]: VNode[] | undefined }, h: CreateElement) {\n  const children: VNode[] = []\n\n  for (const slot in slots) {\n    if (slots.hasOwnProperty(slot)) {\n      children.push(h('template', { slot }, slots[slot]))\n    }\n  }\n\n  return children\n}\n"],"sourceRoot":"","file":"rebuildFunctionalSlots.js"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dimailn/vuetify",
   "description": "Vue Material Component Framework",
-  "version": "2.7.2-alpha4",
+  "version": "2.7.2-alpha41",
   "author": {
     "name": "John Leider",
     "email": "john@vuetifyjs.com"
@@ -56,7 +56,7 @@
     "test:win32": "cross-env NODE_ENV=test jest -i",
     "test:coverage": "yarn test --coverage",
     "test:types": "tsc -p ./types/test/tsconfig.json",
-    "lint": "concurrently -n \"tsc,eslint,types\" --kill-others-on-fail \"tsc --noEmit --pretty\" \"eslint --ext .js,.ts src -f codeframe --max-warnings 0\" \"yarn test:types\"",
+    "lint": "concurrently -n \"tsc,eslint,types\" --kill-others-on-fail \"tsc --noEmit --pretty\" \"eslint --ext .js,.ts src -f eslint-formatter-codeframe --max-warnings 0\" \"yarn test:types\"",
     "lint:fix": "concurrently -n \"tsc,eslint,types\" \"tsc --noEmit --pretty\" \"eslint --fix --ext .js,.ts src\" \"yarn test:types\""
   },
   "devDependencies": {
@@ -74,9 +74,10 @@
     "babel-plugin-transform-define": "^1.3.1",
     "babel-polyfill": "^6.26.0",
     "concurrently": "^4.1.1",
+    "cross-env": "^7.0.2",
     "cssnano": "^4.1.10",
     "dotenv": "^8.0.0",
-    "eslint-plugin-jest": "^24.1.0",
+    "eslint-plugin-jest": "^27.6.0",
     "file-loader": "^4.1.0",
     "fork-ts-checker-webpack-plugin": "^1.6.0",
     "friendly-errors-webpack-plugin": "^1.7.0",
@@ -94,7 +95,7 @@
     "stylus-loader": "^3.0.2",
     "ts-loader": "^8.0.6",
     "url-loader": "^2.1.0",
-    "vue-meta": "^2.4.0",
+    "vue-meta": "3.0.0-alpha.10",
     "vuetify-loader": "^1.3.0",
     "webpack-dev-server": "^3.7.2"
   },

package/src/components/VAlert/VAlert.ts

@@ -1,4 +1,4 @@
-import {h, vShow, withDirectives} from 'vue'
+import { h, vShow, withDirectives, Transition } from 'vue'
 // Styles
 import './VAlert.sass'
 
@@ -20,8 +20,7 @@ import { breaking } from '../../util/console'
 import { getSlot } from '../../util/helpers'
 
 // Types
-import { VNodeData, Transition } from 'vue'
-import { VNode } from 'vue/types'
+import type { VNode, VNodeData } from '../../types/vue-internal'
 
 /* @vue/component */
 export default mixins(
@@ -31,6 +30,8 @@ export default mixins(
 ).extend({
   name: 'v-alert',
 
+  emits: ['update:modelValue'],
+
   props: {
     border: {
       type: String,
@@ -39,27 +40,26 @@ export default mixins(
           'top',
           'right',
           'bottom',
-          'left',
+          'left'
         ].includes(val)
-      },
+      }
     },
     closeLabel: {
       type: String,
-      default: '$vuetify.close',
+      default: '$vuetify.close'
     },
     coloredBorder: Boolean,
     dense: Boolean,
     dismissible: Boolean,
     closeIcon: {
       type: String,
-      default: '$cancel',
+      default: '$cancel'
     },
     icon: {
-      default: '',
       type: [Boolean, String],
       validator (val: boolean | string) {
         return typeof val === 'string' || val === false
-      },
+      }
     },
     outlined: Boolean,
     prominent: Boolean,
@@ -71,14 +71,14 @@ export default mixins(
           'info',
           'error',
           'success',
-          'warning',
+          'warning'
         ].includes(val)
-      },
+      }
     },
-    value: {
+    modelValue: {
       type: Boolean,
-      default: true,
-    },
+      default: true
+    }
   },
 
   computed: {
@@ -87,7 +87,7 @@ export default mixins(
 
       let data: VNodeData = {
         class: ['v-alert__border', {
-          [`v-alert__border--${this.border}`]: true,
+          [`v-alert__border--${this.border}`]: true
         }]
       }
 
@@ -109,11 +109,13 @@ export default mixins(
         icon: true,
         small: true,
         'aria-label': this.$vuetify.lang.t(this.closeLabel),
-        onClick: () => (this.isActive = false),
-      }, [
+        onClick: () => (this.isActive = false)
+      }, () => [
         h(VIcon, {
-          color,
-        }, this.closeIcon),
+          color
+        }, {
+          default: () => this.closeIcon
+        })
       ])
     },
     __cachedIcon (): VNode | null {
@@ -121,8 +123,10 @@ export default mixins(
 
       return h(VIcon, {
         class: 'v-alert__icon',
-        color: this.iconColor,
-      }, this.computedIcon)
+        color: this.iconColor
+      }, {
+        default: () => this.computedIcon
+      })
     },
     classes (): object {
       const classes: Record<string, boolean> = {
@@ -131,7 +135,7 @@ export default mixins(
         'v-alert--dense': this.dense,
         'v-alert--outlined': this.outlined,
         'v-alert--prominent': this.prominent,
-        'v-alert--text': this.text,
+        'v-alert--text': this.text
       }
 
       if (this.border) {
@@ -170,14 +174,20 @@ export default mixins(
       ) return true
 
       return Themeable.computed.isDark.call(this)
-    },
+    }
   },
 
   created () {
+    const breakingProps = [
+      ['outline', 'outlined'],
+      ['value', 'modelValue'],
+      ['onInput', 'onUpdate:modelValue']
+    ]
+
     /* istanbul ignore next */
-    if (this.$attrs.hasOwnProperty('outline')) {
-      breaking('outline', 'outlined', this)
-    }
+    breakingProps.forEach(([original, replacement]) => {
+      if (this.$attrs.hasOwnProperty(original)) breaking(original, replacement, this)
+    })
   },
 
   methods: {
@@ -189,18 +199,18 @@ export default mixins(
         getSlot(this, 'append'),
         this.$slots.close
           ? this.$slots.close({ toggle: this.toggle })
-          : this.__cachedDismissible,
+          : this.__cachedDismissible
       ]
 
       const data: VNodeData = {
-        class: 'v-alert__wrapper',
+        class: 'v-alert__wrapper'
       }
 
       return h('div', data, children)
     },
     genContent (): VNode {
       return h('div', {
-        class: 'v-alert__content',
+        class: 'v-alert__content'
       }, getSlot(this))
     },
     genAlert (): VNode {
@@ -223,12 +233,12 @@ export default mixins(
         data = setColor(this.computedColor, data)
       }
 
-      return withDirectives(h('div', data, [this.genWrapper()]), directives)
+      return withDirectives(h('div', data, [this.genWrapper()]), directives as any)
     },
     /** @public */
     toggle () {
       this.isActive = !this.isActive
-    },
+    }
   },
 
   render (): VNode {
@@ -240,6 +250,6 @@ export default mixins(
       name: this.transition,
       origin: this.origin,
       mode: this.mode
-    }, [render])
-  },
+    }, () => [render])
+  }
 })

package/src/components/VAlert/__tests__/VAlert.spec.ts

@@ -2,31 +2,28 @@
 import VAlert from '../VAlert'
 
 // Utilities
-import {
-  mount,
-  Wrapper,
-} from '@vue/test-utils'
+import { mount, enableAutoUnmount, VueWrapper, config } from '@vue/test-utils'
 
 // Types
 import { ExtractVue } from '../../../util/mixins'
 
 describe('VAlert.ts', () => {
-  type Instance = ExtractVue<typeof VAlert>
-  let mountFunction: (options?: object) => Wrapper<Instance>
+  type Instance = ExtractVue<typeof VAlert>;
+  let mountFunction: (options?: object) => VueWrapper<Instance>
+
+  enableAutoUnmount(afterEach)
 
   beforeEach(() => {
     mountFunction = (options = {}) => {
+      console.log('options', options)
       return mount(VAlert, {
         ...options,
-        // https://github.com/vuejs/vue-test-utils/issues/1130
-        sync: false,
-        mocks: {
-          $vuetify: {
-            lang: {
-              t: (val: string) => val,
-            },
+        global: {
+          mocks: {
+            ...config.global.mocks
           },
-        },
+          ...options.global
+        }
       })
     }
   })
@@ -37,16 +34,18 @@ describe('VAlert.ts', () => {
     expect(wrapper.element.style.display).toBe('')
     expect(wrapper.html()).toMatchSnapshot()
 
-    wrapper.setProps({ value: false })
-    await wrapper.vm.$nextTick()
+    await wrapper.setProps({ modelValue: false })
 
+    // Check that isActive is false
+    expect(wrapper.vm.isActive).toBe(false)
+    // Check that element is hidden
     expect(wrapper.element.style.display).toBe('none')
     expect(wrapper.html()).toMatchSnapshot()
   })
 
   it('should have a close icon', () => {
     const wrapper = mountFunction({
-      propsData: { dismissible: true },
+      props: { dismissible: true }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -54,69 +53,64 @@ describe('VAlert.ts', () => {
 
   it('should be dismissible', async () => {
     const wrapper = mountFunction({
-      propsData: {
-        dismissible: true,
-      },
+      props: {
+        dismissible: true
+      }
     })
 
     const icon = wrapper.find('.v-alert__dismissible')
-    const input = jest.fn(show => wrapper.setProps({ show }))
 
-    wrapper.vm.$on('input', input)
+    await icon.trigger('click')
 
-    icon.trigger('click')
-    await wrapper.vm.$nextTick()
-
-    expect(input).toHaveBeenCalledWith(false)
+    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
+    expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([false])
     expect(wrapper.html()).toMatchSnapshot()
   })
 
   it('should have a custom icon', () => {
     const wrapper = mountFunction({
-      propsData: {
-        icon: 'list',
-      },
+      props: {
+        icon: 'mdi-list'
+      }
     })
 
     const icon = wrapper.find('.v-alert__icon')
 
-    expect(icon.text()).toBe('list')
+    expect(icon.exists()).toBe(true)
+    // С component: null иконки рендерятся как font-иконки с содержимым
+    expect(icon.classes()).toContain('v-icon')
+    expect(icon.classes()).toContain('v-alert__icon')
   })
 
   it('should have no icon', () => {
     const wrapper = mountFunction()
 
-    expect(wrapper.contains('.v-icon')).toBe(false)
+    expect(wrapper.find('.v-icon').exists()).toBe(false)
   })
 
-  // TODO: this fails without sync, nextTick doesn't help
-  // https://github.com/vuejs/vue-test-utils/issues/1130
-  it.skip('should display contextual colors by type', async () => {
+  it('should display contextual colors by type', async () => {
     const wrapper = mountFunction({
-      propsData: { type: 'error' },
+      props: { type: 'error' }
     })
 
     expect(wrapper.classes('error')).toBe(true)
 
-    wrapper.setProps({ type: 'success' })
-    await wrapper.vm.$nextTick()
+    await wrapper.setProps({ type: 'success' })
     expect(wrapper.classes('success')).toBe(true)
 
-    wrapper.setProps({ type: 'warning' })
-    await wrapper.vm.$nextTick()
+    await wrapper.setProps({ type: 'warning' })
     expect(wrapper.classes('warning')).toBe(true)
 
-    wrapper.setProps({ type: 'info' })
-    await wrapper.vm.$nextTick()
+    await wrapper.setProps({ type: 'info' })
     expect(wrapper.classes('info')).toBe(true)
   })
 
   it('should allow overriding color for contextual alert', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         type: 'error',
-        color: 'primary',
-      },
+        color: 'primary'
+      }
     })
 
     expect(wrapper.classes('primary')).toBe(true)
@@ -124,28 +118,33 @@ describe('VAlert.ts', () => {
 
   it('should allow overriding icon for contextual alert', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         type: 'error',
-        icon: 'block',
-      },
+        icon: 'mdi-block'
+      }
     })
 
     const icon = wrapper.find('.v-alert__icon')
 
-    expect(icon.text()).toBe('block')
+    expect(icon.exists()).toBe(true)
+    // С component: null иконки рендерятся как font-иконки с содержимым
+    expect(icon.classes()).toContain('v-icon')
+    expect(icon.classes()).toContain('v-alert__icon')
   })
 
   it('should render custom dismissible icon', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         dismissible: true,
-        closeIcon: 'foo',
-      },
+        closeIcon: 'mdi-close'
+      }
     })
 
-    const icon = wrapper.find('.v-alert__content + .v-btn')
+    const icon = wrapper.find('.v-alert__content + .v-btn .v-icon')
 
-    expect(icon.text()).toBe('foo')
+    expect(icon.exists()).toBe(true)
+    // С component: null иконки рендерятся как font-иконки с содержимым
+    expect(icon.classes()).toContain('v-icon')
   })
 
   it('should show border', async () => {
@@ -155,8 +154,7 @@ describe('VAlert.ts', () => {
     expect(wrapper.classes('v-alert--border')).toBe(false)
 
     for (const border of directions) {
-      wrapper.setProps({ border })
-      await wrapper.vm.$nextTick()
+      await wrapper.setProps({ border })
 
       expect(wrapper.classes('v-alert--border')).toBe(true)
       expect(wrapper.classes(`v-alert--border-${border}`)).toBe(true)
@@ -165,18 +163,17 @@ describe('VAlert.ts', () => {
 
   it('should move color classes to border and icon elements', async () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         color: 'pink',
-        border: 'left',
-      },
+        border: 'left'
+      }
     })
     const border = wrapper.find('.v-alert__border')
 
     expect(wrapper.classes('pink')).toBe(true)
     expect(border.classes('pink')).toBe(false)
 
-    wrapper.setProps({ coloredBorder: true })
-    await wrapper.vm.$nextTick()
+    await wrapper.setProps({ coloredBorder: true })
     expect(wrapper.classes('pink')).toBe(false)
     expect(border.classes('pink')).toBe(true)
     expect(border.classes('v-alert__border--has-color')).toBe(true)
@@ -191,4 +188,35 @@ describe('VAlert.ts', () => {
 
     expect(wrapper.vm.isActive).toBe(false)
   })
+
+  it('should render font icons with proper classes', () => {
+    const wrapper = mountFunction({
+      props: {
+        type: 'error',
+        icon: 'mdi-alert'
+      }
+    })
+
+    const icon = wrapper.find('.v-alert__icon')
+
+    expect(icon.exists()).toBe(true)
+    // С component: null иконки рендерятся как font-иконки с CSS классами
+    // В JSDOM текстовое содержимое не отображается, но классы присутствуют
+    expect(icon.classes()).toContain('v-icon')
+    expect(icon.classes()).toContain('v-alert__icon')
+    expect(icon.classes()).toContain('mdi')
+    expect(icon.classes()).toContain('mdi-alert')
+  })
+
+  it('should translate aria-label correctly', () => {
+    const wrapper = mountFunction({
+      props: { dismissible: true }
+    })
+
+    const button = wrapper.find('.v-alert__dismissible')
+
+    expect(button.exists()).toBe(true)
+    // Проверяем что перевод $vuetify.close работает правильно
+    expect(button.element.getAttribute('aria-label')).toBe('Close')
+  })
 })

package/src/components/VAlert/__tests__/__snapshots__/VAlert.spec.ts.snap

@@ -1,22 +1,21 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`VAlert.ts should be dismissible 1`] = `
-<div role="alert"
-     class="v-alert v-sheet theme--light"
+<div class="v-alert v-sheet theme--light"
+     role="alert"
      style="display: none;"
 >
   <div class="v-alert__wrapper">
     <div class="v-alert__content">
     </div>
-    <button type="button"
-            class="v-alert__dismissible v-btn v-btn--icon v-btn--round theme--light v-size--small"
-            aria-label="$vuetify.close"
+    <button class="v-btn v-btn--icon v-btn--round theme--light v-size--small v-alert__dismissible"
+            type="button"
+            aria-label="Close"
     >
       <span class="v-btn__content">
-        <i aria-hidden="true"
-           class="v-icon notranslate material-icons theme--light"
+        <i class="v-icon notranslate theme--light mdi mdi-close-circle"
+           aria-hidden="true"
         >
-          $cancel
         </i>
       </span>
     </button>
@@ -25,8 +24,8 @@ exports[`VAlert.ts should be dismissible 1`] = `
 `;
 
 exports[`VAlert.ts should be open by default 1`] = `
-<div role="alert"
-     class="v-alert v-sheet theme--light"
+<div class="v-alert v-sheet theme--light"
+     role="alert"
 >
   <div class="v-alert__wrapper">
     <div class="v-alert__content">
@@ -36,8 +35,8 @@ exports[`VAlert.ts should be open by default 1`] = `
 `;
 
 exports[`VAlert.ts should be open by default 2`] = `
-<div role="alert"
-     class="v-alert v-sheet theme--light"
+<div class="v-alert v-sheet theme--light"
+     role="alert"
      style="display: none;"
 >
   <div class="v-alert__wrapper">
@@ -48,21 +47,20 @@ exports[`VAlert.ts should be open by default 2`] = `
 `;
 
 exports[`VAlert.ts should have a close icon 1`] = `
-<div role="alert"
-     class="v-alert v-sheet theme--light"
+<div class="v-alert v-sheet theme--light"
+     role="alert"
 >
   <div class="v-alert__wrapper">
     <div class="v-alert__content">
     </div>
-    <button type="button"
-            class="v-alert__dismissible v-btn v-btn--icon v-btn--round theme--light v-size--small"
-            aria-label="$vuetify.close"
+    <button class="v-btn v-btn--icon v-btn--round theme--light v-size--small v-alert__dismissible"
+            type="button"
+            aria-label="Close"
     >
       <span class="v-btn__content">
-        <i aria-hidden="true"
-           class="v-icon notranslate material-icons theme--light"
+        <i class="v-icon notranslate theme--light mdi mdi-close-circle"
+           aria-hidden="true"
         >
-          $cancel
         </i>
       </span>
     </button>