From 39437ba90744f1c48f81ccd228388b062e7461b3 Mon Sep 17 00:00:00 2001
From: Justineo <justice360@gmail.com>
Date: Tue, 23 Feb 2021 14:32:43 +0800
Subject: [PATCH] fix: fix named export and default export

---
 CHANGELOG.md      |   1 +
 rollup.config.js  |   2 -
 src/all.ts        |   4 +-
 src/demo/App.vue  | 153 ----------------------------------------------
 src/demo/Demo.vue |   2 +-
 src/index.ts      |   3 +
 6 files changed, 8 insertions(+), 157 deletions(-)
 delete mode 100644 src/demo/App.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83ce356..8dcc977 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 6.0.0-alpha.4
 
 * Add missing injection key exports.
+
 ## 6.0.0-alpha.3
 
 * Add missing dependencies for `vue-demi` and `resize-detector`.
diff --git a/rollup.config.js b/rollup.config.js
index 02721a1..ddfc6a3 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -31,13 +31,11 @@ const options = [
       {
         file: "dist/index.cjs.js",
         format: "cjs",
-        exports: "default",
         sourcemap: true
       },
       {
         file: "dist/index.cjs.min.js",
         format: "cjs",
-        exports: "default",
         sourcemap: true,
         plugins: [
           terser({
diff --git a/src/all.ts b/src/all.ts
index 557fb56..3b5355b 100644
--- a/src/all.ts
+++ b/src/all.ts
@@ -1,3 +1,5 @@
 import "echarts";
+import ECharts from "./index";
 
-export * from "./ECharts";
+export default ECharts;
+export * from "./index";
diff --git a/src/demo/App.vue b/src/demo/App.vue
deleted file mode 100644
index 8ad27bf..0000000
--- a/src/demo/App.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-  <article>
-    <div class="settings">
-      <label><input type="checkbox" v-model="autoresize" /> Autoresize</label>
-      <label
-        ><input type="checkbox" v-model="defaultTheme" /> Default theme</label
-      >
-      <label><input type="checkbox" v-model="loading" /> Loading</label>
-      <label><input type="checkbox" v-model="useSvg" /> Use SVG</label>
-      <label><input type="checkbox" v-model="useRef" /> Use ref data</label>
-      <button @click="mutate" :disabled="useRef">Mutate data</button>
-      <button @click="set" :disabled="!useRef">Set data</button>
-      <button @click="mutateLoadingOptions" :disabled="!loading">
-        Mutate loading option
-      </button>
-    </div>
-    <v-chart
-      style="width: 100%; height: 400px"
-      ref="foo"
-      :autoresize="autoresize"
-      :option="realOption"
-      :loading="loading"
-      :loading-options="loadingOptions"
-      :theme="defaultTheme ? null : 'dark'"
-      :init-options="initOptions"
-      @click="log('echarts')"
-      @zr:click="log('zr')"
-    />
-  </article>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, reactive, ref } from "vue";
-import VChart from "../ECharts";
-import * as echarts from "echarts/core";
-import { GridComponent } from "echarts/components";
-import { LineChart } from "echarts/charts";
-import { CanvasRenderer, SVGRenderer } from "echarts/renderers";
-echarts.use([GridComponent, LineChart, CanvasRenderer, SVGRenderer]);
-
-export default defineComponent({
-  name: "App",
-  components: {
-    VChart,
-  },
-  setup() {
-    const foo = ref();
-    const option = reactive({
-      xAxis: {
-        type: "category",
-        data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
-      },
-      yAxis: {
-        type: "value",
-      },
-      series: [
-        {
-          data: [150, 230, 224, 218, 135, 147, 260],
-          type: "line",
-        },
-      ],
-    });
-    const optionRef = ref({
-      xAxis: {
-        type: "category",
-        data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
-      },
-      yAxis: {
-        type: "value",
-      },
-      series: [
-        {
-          data: [233, 128, 184, 302, 208, 287, 212],
-          type: "line",
-        },
-      ],
-    });
-
-    const loadingOptions = reactive({
-      text: "正在加载...",
-    });
-
-    const autoresize = ref<boolean>(true);
-    const defaultTheme = ref<boolean>(true);
-    const useSvg = ref<boolean>(false);
-    const useRef = ref<boolean>(false);
-    const loading = ref<boolean>(false);
-    const initOptions = computed(() => ({
-      renderer: useSvg.value ? "svg" : "canvas",
-    }));
-    const realOption = computed(() =>
-      useRef.value ? optionRef.value : option
-    );
-
-    function mutate() {
-      option.series[0].data = [150, 230, 224, 218, 135, 147, 260].map(
-        (val) => val + Math.round(50 * Math.random())
-      );
-    }
-
-    function set() {
-      optionRef.value = {
-        xAxis: {
-          type: "category",
-          data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
-        },
-        yAxis: {
-          type: "value",
-        },
-        series: [
-          {
-            data: [
-              233 + Math.round(50 * Math.random()),
-              128 + Math.round(50 * Math.random()),
-              184 + Math.round(50 * Math.random()),
-              302 + Math.round(50 * Math.random()),
-              208 + Math.round(50 * Math.random()),
-              287 + Math.round(50 * Math.random()),
-              212 + Math.round(50 * Math.random()),
-            ],
-            type: "line",
-          },
-        ],
-      };
-    }
-
-    function mutateLoadingOptions() {
-      loadingOptions.text += ".";
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    function log(...args: any[]) {
-      console.log(...args);
-    }
-
-    return {
-      realOption,
-      autoresize,
-      defaultTheme,
-      useSvg,
-      useRef,
-      initOptions,
-      mutate,
-      set,
-      loading,
-      loadingOptions,
-      mutateLoadingOptions,
-      foo,
-      log,
-    };
-  },
-});
-</script>
diff --git a/src/demo/Demo.vue b/src/demo/Demo.vue
index de08b61..903f97b 100644
--- a/src/demo/Demo.vue
+++ b/src/demo/Demo.vue
@@ -272,7 +272,7 @@
 <script>
 /* eslint-disable no-console */
 import qs from "qs";
-import VChart from "../ECharts";
+import VChart from "../../dist/index.esm";
 
 import * as echarts from "echarts/core";
 import {
diff --git a/src/index.ts b/src/index.ts
index 55bb888..2c9f29d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1 +1,4 @@
+import ECharts from "./ECharts";
+
+export default ECharts;
 export * from "./ECharts";