refactor: use tree-shakable api from echarts 5

rsuite · Jun 16, 2022 · 29e9602 · 29e9602
1 parent b4b6279
commit 29e9602
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 27 deletions.
diff --git a/src/components/DataZoom.ts b/src/components/DataZoom.ts
@@ -1,7 +1,9 @@
-import type { DataZoomComponentOption } from 'echarts';
-import 'echarts/lib/component/dataZoom';
+import * as echarts from 'echarts/core';
+import { DataZoomComponent, type DataZoomComponentOption } from 'echarts/components';
 import { symbols } from '../constants';
 
+echarts.use([DataZoomComponent]);
+
 export type DataZoomProps = DataZoomComponentOption;
 
 function DataZoom(_: DataZoomProps) {

diff --git a/src/components/Legend.ts b/src/components/Legend.ts
@@ -1,8 +1,9 @@
-import type { LegendComponentOption } from 'echarts';
-import 'echarts/lib/component/legend';
-import 'echarts/lib/component/legendScroll';
+import * as echarts from 'echarts/core';
+import { LegendComponent, type LegendComponentOption } from 'echarts/components';
 import { symbols } from '../constants';
 
+echarts.use([LegendComponent]);
+
 export type LegendProps = LegendComponentOption;
 
 function Legend(_: LegendProps) {

diff --git a/src/components/Radar.ts b/src/components/Radar.ts
@@ -1,7 +1,9 @@
-import type { RadarComponentOption } from 'echarts';
-import 'echarts/lib/component/radar';
+import * as echarts from 'echarts/core';
+import { RadarComponent, type RadarComponentOption } from 'echarts/components';
 import { symbols } from '../constants';
 
+echarts.use([RadarComponent]);
+
 export type RadarProps = RadarComponentOption;
 
 function Radar(_: RadarProps) {

diff --git a/src/components/Tooltip.ts b/src/components/Tooltip.ts
@@ -1,7 +1,9 @@
-import type { TooltipComponentOption } from 'echarts';
-import 'echarts/lib/component/tooltip';
+import * as echarts from 'echarts/core';
+import { TooltipComponent, type TooltipComponentOption } from 'echarts/components';
 import { symbols } from '../constants';
 
+echarts.use([TooltipComponent]);
+
 export type TooltipProps = TooltipComponentOption;
 
 function Tooltip(_: TooltipProps) {

diff --git a/src/components/VisualMap.ts b/src/components/VisualMap.ts
@@ -1,7 +1,9 @@
-import type { VisualMapComponentOption } from 'echarts';
-import 'echarts/lib/component/visualMap';
+import * as echarts from 'echarts/core';
+import { VisualMapComponent, type VisualMapComponentOption } from 'echarts/components';
 import { symbols } from '../constants';
 
+echarts.use([VisualMapComponent]);
+
 export type VisualMapProps = VisualMapComponentOption;
 
 function VisualMap(_: VisualMapProps) {

diff --git a/src/series/Bars.ts b/src/series/Bars.ts
@@ -1,7 +1,9 @@
-import type { BarSeriesOption } from 'echarts';
-import 'echarts/lib/chart/bar';
+import * as echarts from 'echarts/core';
+import { BarChart, type BarSeriesOption } from 'echarts/charts';
 import { symbols } from '../constants';
 
+echarts.use([BarChart]);
+
 type BarsProps = Omit<BarSeriesOption, 'stack'> & {
   color?: string | string[];
   stack?: string | true;

diff --git a/src/series/Funnel.ts b/src/series/Funnel.ts
@@ -1,7 +1,9 @@
-import type { FunnelSeriesOption } from 'echarts';
-import 'echarts/lib/chart/funnel';
+import * as echarts from 'echarts/core';
+import { FunnelChart, type FunnelSeriesOption } from 'echarts/charts';
 import { symbols } from '../constants';
 
+echarts.use([FunnelChart]);
+
 export interface FunnelProps extends FunnelSeriesOption {
   asc?: boolean;
 }

diff --git a/src/series/Line.ts b/src/series/Line.ts
@@ -1,7 +1,9 @@
-import type { LineSeriesOption } from 'echarts';
-import 'echarts/lib/chart/line';
+import * as echarts from 'echarts/core';
+import { LineChart, type LineSeriesOption } from 'echarts/charts';
 import { symbols } from '../constants';
 
+echarts.use([LineChart]);
+
 export type LineProps = Omit<LineSeriesOption, 'stack'> & {
   stack?: string | boolean;
   area?: boolean;

diff --git a/src/series/Map.ts b/src/series/Map.ts
@@ -1,7 +1,9 @@
-import type { MapSeriesOption } from 'echarts';
-import 'echarts/lib/chart/map';
+import * as echarts from 'echarts/core';
+import { MapChart, type MapSeriesOption } from 'echarts/charts';
 import { symbols } from '../constants';
 
+echarts.use([MapChart]);
+
 export type MapProps = MapSeriesOption;
 
 function Map(_: MapProps) {

diff --git a/src/series/Pie.ts b/src/series/Pie.ts
@@ -1,7 +1,9 @@
-import type { PieSeriesOption } from 'echarts';
-import 'echarts/lib/chart/pie';
+import * as echarts from 'echarts/core';
+import { PieChart, type PieSeriesOption } from 'echarts/charts';
 import { symbols } from '../constants';
 
+echarts.use([PieChart]);
+
 export interface PieProps extends PieSeriesOption {
   donut?: boolean;
 }

diff --git a/src/series/Scatter.ts b/src/series/Scatter.ts
@@ -1,7 +1,9 @@
-import type { ScatterSeriesOption } from 'echarts';
-import 'echarts/lib/chart/scatter';
+import * as echarts from 'echarts/core';
+import { ScatterChart, type ScatterSeriesOption } from 'echarts/charts';
 import { symbols } from '../constants';
 
+echarts.use([ScatterChart]);
+
 export type ScatterProps = ScatterSeriesOption;
 
 function Scatter(_: ScatterProps) {

diff --git a/src/series/Tree.ts b/src/series/Tree.ts
@@ -1,7 +1,9 @@
-import type { TreeSeriesOption } from 'echarts';
-import 'echarts/lib/chart/tree';
+import * as echarts from 'echarts/core';
+import { TreeChart, type TreeSeriesOption } from 'echarts/charts';
 import { symbols } from '../constants';
 
+echarts.use([TreeChart]);
+
 export type TreeProps = TreeSeriesOption;
 
 function Tree(_: TreeProps) {

diff --git a/src/series/Treemap.ts b/src/series/Treemap.ts
@@ -1,7 +1,9 @@
-import type { TreemapSeriesOption } from 'echarts';
-import 'echarts/lib/chart/treemap';
+import * as echarts from 'echarts/core';
+import { TreemapChart, type TreemapSeriesOption } from 'echarts/charts';
 import { symbols } from '../constants';
 
+echarts.use([TreemapChart]);
+
 export type TreemapProps = TreemapSeriesOption;
 
 function Treemap(_: TreemapProps) {