Skip to content

Commit da0857c

Browse files
kagawagaokagawagao
committed
fix: remove vue-demi
1 parent d31069b commit da0857c

File tree

38 files changed

+43
-68
lines changed

38 files changed

+43
-68
lines changed

‎babel.config.js

+4-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// eslint-disable-next-line
2-
const { isVue2, isVue3 } = require('vue-demi')
32

43
module.exports = {
54
presets: [
@@ -16,14 +15,8 @@ module.exports = {
1615
},
1716
],
1817
'@babel/preset-typescript',
19-
isVue2 && [
20-
'@vue/babel-preset-jsx',
21-
{
22-
compositionAPI: 'vue-demi',
23-
},
24-
],
25-
].filter(Boolean),
26-
plugins: [isVue3 && '@vue/babel-plugin-jsx'].filter(Boolean),
18+
],
19+
plugins: ['@vue/babel-plugin-jsx'],
2720
env: {
2821
commonjs: {
2922
presets: [
@@ -40,14 +33,8 @@ module.exports = {
4033
},
4134
],
4235
'@babel/preset-typescript',
43-
isVue2 && [
44-
'@vue/babel-preset-jsx',
45-
{
46-
compositionAPI: 'vue-demi',
47-
},
48-
],
49-
].filter(Boolean),
50-
plugins: [isVue3 && '@vue/babel-plugin-jsx'].filter(Boolean),
36+
],
37+
plugins: ['@vue/babel-plugin-jsx'],
5138
},
5239
},
5340
}

‎src/plots/area/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Area, AreaOptions } from '@antv/g2plot'
2-
import { App, defineComponent } from 'vue-demi'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/bar/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Bar, BarOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/bidirectional-bar/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { BidirectionalBar, BidirectionalBarOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/box/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Box, BoxOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/bullet/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Bullet, BulletOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/chord/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Chord, ChordOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/circle-packing/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { CirclePacking, CirclePackingOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/column/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Column, ColumnOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/dual-axes/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { DualAxes, DualAxesOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/facet/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Facet, FacetOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/funnel/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Funnel, FunnelOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/gauge/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Gauge, GaugeOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/heatmap/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Heatmap, HeatmapOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/histogram/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Histogram, HistogramOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/line/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Line, LineOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/liquid/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Liquid, LiquidOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/mix/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Mix, MixOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/multi-view/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Mix, MixOptions } from '@antv/g2plot'
2-
import { App, defineComponent } from 'vue-demi'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/pie/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Pie, PieOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/progress/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Progress, ProgressOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/radar/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Radar, RadarOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/radial-bar/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { RadialBar, RadialBarOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/ring-progress/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { RingProgress, RingProgressOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/rose/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Rose, RoseOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/sankey/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Sankey, SankeyOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/scatter/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Scatter, ScatterOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/stock/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Stock, StockOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/sunburst/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Sunburst, SunburstOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/tiny-area/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { TinyArea, TinyAreaOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/tiny-column/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { TinyColumn, TinyColumnOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/tiny-line/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { TinyLine, TinyLineOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/treemap/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Treemap, TreemapOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/venn/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Venn, VennOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/violin/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Violin, ViolinOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/waterfall/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { Waterfall, WaterfallOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/plots/word-cloud/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { App, defineComponent } from 'vue-demi'
21
import { WordCloud, WordCloudOptions } from '@antv/g2plot'
2+
import { App, defineComponent } from 'vue'
33
import BaseChart, { BaseChartProps } from '../../components/base'
44
import { Writeable } from '../../types'
55
import { mergeAttrs } from '../../utils'

‎src/utils.ts

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
import { isVue3 } from 'vue-demi'
2-
31
/**
42
* compatible merge attrs
53
* @param props props
64
* @param attrs attrs
75
* @returns merged attrs
86
*/
97
export const mergeAttrs = (props: any, attrs: Record<string, any>) => {
10-
/* istanbul ignore else */
11-
if (isVue3) {
12-
return {
13-
...attrs,
14-
...props,
15-
}
16-
} else {
17-
return {
18-
attrs: {
19-
...attrs,
20-
...props,
21-
},
22-
}
8+
return {
9+
...attrs,
10+
...props,
2311
}
2412
}

0 commit comments

Comments
 (0)