Drop support Vue 2 (#453)

* Drop support Vue 2

* update

* fix

* fix

Author: ota-meshi

packages/vue-cheetah-grid/README.md

@@ -8,7 +8,7 @@
 [![npm](https://img.shields.io/npm/dt/vue-cheetah-grid.svg)](http://www.npmtrends.com/vue-cheetah-grid)
 [![Build Status](https://github.com/future-architect/cheetah-grid/workflows/CI/badge.svg?branch=master)](https://github.com/future-architect/cheetah-grid/actions?query=workflow%3ACI)
 
-It supports Vue 2 and Vue 3.
+It supports Vue 3.
 
 ## Install using npm
 
@@ -44,8 +44,6 @@ npm install -S vue-cheetah-grid
 
 ### Use Components Globally
 
-Vue3:
-
 ```js
 import { createApp } from "vue";
 import CGrid from "vue-cheetah-grid";
@@ -55,15 +53,6 @@ const app = createApp(App);
 app.use(CGrid);
 ```
 
-Vue2:
-
-```js
-import Vue from "vue";
-import CGrid from "vue-cheetah-grid";
-
-Vue.use(CGrid);
-```
-
 ### Use Components Locally
 
 ```vue

packages/vue-cheetah-grid/karma.conf.js

@@ -27,14 +27,10 @@ module.exports = function (config) {
       ]
     },
     browserNoActivityTimeout: 90000,
-    browsers: ['Chrome'
-    // 'IE_no_addons'
+    browsers: [
+      'Chrome'
     ],
     customLaunchers: {
-      IE_no_addons: {
-        base: 'IE',
-        flags: ['-extoff']
-      },
       Chrome_travis_ci: {
         base: 'ChromeHeadless',
         flags: ['--no-sandbox']

packages/vue-cheetah-grid/lib/CGrid.vue

@@ -39,9 +39,8 @@ import {
   cheetahGrid,
   gridUpdateWatcher,
   extend,
-  vue3Emits,
-  getSlotChildren,
-  hackVue3
+  emits,
+  getSlotChildren
 } from './c-grid/utils'
 import { slotElementsToHeaderOptions, slotElementsToHeaderProps } from './c-grid/header-utils'
 
@@ -271,10 +270,6 @@ let seq = 0
  */
 export default {
   name: 'CGrid',
-  get mixins () {
-    hackVue3(this)
-    return undefined
-  },
   provide () {
     return {
       $_CGridInstance: this
@@ -415,7 +410,7 @@ export default {
     'paste-cell': null,
     'changed-value': null,
     'changed-header-value': null,
-    ...vue3Emits
+    ...emits
   },
   data () {
     return {
@@ -536,14 +531,17 @@ export default {
     }
     _initGrid(this)
   },
-  // for Vue 3
   unmounted () {
-    destroyed(this)
-  },
-  // for Vue 2
-  // eslint-disable-next-line vue/no-deprecated-destroyed-lifecycle
-  destroyed () {
-    destroyed(this)
+    const vm = this
+    vm.$_CGrid_cancelNextTickUpdate()
+    if (vm.rawGrid) {
+      vm.rawGrid.dispose()
+      vm.rawGrid = null
+    }
+    if (vm._dataSources) {
+      vm._dataSources.forEach(dc => dc.dispose())
+    }
+    vm.$_CGrid_defineColumns = []
   },
   updated () {
     this.$_CGrid_nextTickUpdate()
@@ -743,17 +741,6 @@ export default {
     }
   }
 }
-function destroyed (vm) {
-  vm.$_CGrid_cancelNextTickUpdate()
-  if (vm.rawGrid) {
-    vm.rawGrid.dispose()
-    vm.rawGrid = null
-  }
-  if (vm._dataSources) {
-    vm._dataSources.forEach(dc => dc.dispose())
-  }
-  vm.$_CGrid_defineColumns = []
-}
 </script>
 
 <style scoped>

packages/vue-cheetah-grid/lib/CGridLayoutRow.vue

@@ -10,7 +10,7 @@
 
 <script>
 import { slotElementsToHeaderOptions, slotElementsToHeaderProps } from './c-grid/header-utils'
-import { getSlotChildren, hackVue3 } from './c-grid/utils'
+import { getSlotChildren } from './c-grid/utils'
 import { storeElement, removeElement } from './c-grid/elements'
 
 /**
@@ -19,10 +19,6 @@ import { storeElement, removeElement } from './c-grid/elements'
  */
 export default {
   name: 'CGridLayoutRow',
-  get mixins () {
-    hackVue3(this)
-    return undefined
-  },
   inject: ['$_CGridInstance'],
   mounted () {
     storeElement(this)
@@ -32,14 +28,10 @@ export default {
   updated () {
     this.$_CGrid_nextTickUpdate()
   },
-  // for Vue 3
   beforeUnmount () {
-    beforeDestroy(this)
-  },
-  // for Vue 2
-  // eslint-disable-next-line vue/no-deprecated-destroyed-lifecycle
-  beforeDestroy () {
-    beforeDestroy(this)
+    const vm = this
+    removeElement(vm)
+    vm.$_CGridInstance.$_CGrid_removeColumnDefine(vm)
   },
   methods: {
     /**
@@ -64,11 +56,6 @@ export default {
     }
   }
 }
-
-function beforeDestroy (vm) {
-  removeElement(vm)
-  vm.$_CGridInstance.$_CGrid_removeColumnDefine(vm)
-}
 </script>
 
 <style scoped>

packages/vue-cheetah-grid/lib/c-grid/ColumnMixin.vue

@@ -1,15 +1,11 @@
 <script>
-import { gridUpdateWatcher, resolveProxyComputedProps, resolveProxyPropsMethod, vue3Emits, hackVue3 } from './utils'
+import { gridUpdateWatcher, resolveProxyComputedProps, resolveProxyPropsMethod, emits } from './utils'
 import { storeElement, removeElement } from './elements'
 
 /**
  * The Mixin for `<c-grid-column>` components.
  */
 export default {
-  get mixins () {
-    hackVue3(this)
-    return undefined
-  },
   inject: ['$_CGridInstance'],
   props: {
     /**
@@ -62,7 +58,7 @@ export default {
       default: undefined
     }
   },
-  emits: { ...vue3Emits },
+  emits: { ...emits },
   computed: {
     resolvedCaption () {
       const vm = this
@@ -90,14 +86,10 @@ export default {
   updated () {
     this.$_CGrid_nextTickUpdate()
   },
-  // for Vue 3
   beforeUnmount () {
-    beforeDestroy(this)
-  },
-  // for Vue 2
-  // eslint-disable-next-line vue/no-deprecated-destroyed-lifecycle
-  beforeDestroy () {
-    beforeDestroy(this)
+    const vm = this
+    removeElement(vm)
+    vm.$_CGridInstance.$_CGrid_removeColumnDefine(vm)
   },
   methods: {
     /**
@@ -193,9 +185,4 @@ export default {
     $_CGridColumn_headerActionProxy: resolveProxyPropsMethod('headerAction')
   }
 }
-
-function beforeDestroy (vm) {
-  removeElement(vm)
-  vm.$_CGridInstance.$_CGrid_removeColumnDefine(vm)
-}
 </script>

packages/vue-cheetah-grid/lib/c-grid/utils.js

@@ -50,29 +50,8 @@ export function filterToFn (instance, field, filter) {
       set: field.set
     }
   }
-  if (typeof filter === 'function') {
-    return (rec) => applyFilter(getField(rec, field), filter)
-  }
-  const Vue = instance.constructor
-  const maybeV2 = Vue && Vue.filter
-  if (!maybeV2) {
-    return (rec) => applyFilter(getField(rec, field), filter)
-  }
-  // maybe Vue v2
-  filter = filter.trim()
-  const i = filter.indexOf('(')
-  if (i < 0) {
-    return (rec) => {
-      return applyFilter(getField(rec, field), Vue.filter(filter))
-    }
-  } else {
-    const name = filter.slice(0, i)
-    const args = filter.slice(i + 1, filter.length - 1)
-    const props = Function(`with(this){return [${args}]}`).call(instance.$vnode.context) // eslint-disable-line no-new-func
-    return (rec) => {
-      return applyFilter(getField(rec, field), (v) => Vue.filter(name)(v, ...props))
-    }
-  }
+
+  return (rec) => applyFilter(getField(rec, field), filter)
 }
 
 export function normalizeColumnType (columnType) {
@@ -147,19 +126,10 @@ export function getSlotChildren (vm, name = 'defaultSlotContainer') {
 
 // for compatibility
 const { EVENT_TYPE } = cheetahGrid.ListGrid
-export const vue3Emits = Object.keys(EVENT_TYPE)
+/** @type {Record<keyof typeof EVENT_TYPE, null>} */
+export const emits = Object.keys(EVENT_TYPE)
   .map(k => EVENT_TYPE[k].replace(/_/g, '-').toLowerCase())
   .reduce((r, v) => {
     r[v] = null
     return r
   }, {})
-
-export function hackVue3 (options) {
-  // eslint-disable-next-line no-undef
-  if ((typeof __VUE_OPTIONS_API__ !== 'undefined' && __VUE_OPTIONS_API__) ||
-    // eslint-disable-next-line no-undef
-    (typeof Vue !== 'undefined' && `${Vue.version}`.startsWith('3'))) {
-    delete options.beforeDestroy
-    delete options.destroyed
-  }
-}