fix: fix umd build and bundle vue-demi

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-echarts",
-  "version": "6.0.0-alpha.5",
+  "version": "6.0.0-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-echarts",
   "description": "Vue.js component for Apache ECharts.",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.0-beta.2",
   "repository": "https://github.com/ecomfe/vue-echarts.git",
   "license": "MIT",
   "author": "GU Yiling <justice360@gmail.com>",

rollup.config.js

@@ -1,9 +1,23 @@
+import { readFileSync } from "fs";
 import typescript from "rollup-plugin-typescript2";
 import { terser } from "rollup-plugin-terser";
 import resolve from "@rollup/plugin-node-resolve";
 import postcss from "rollup-plugin-postcss";
 import dts from "rollup-plugin-dts";
 
+const VUE_DEMI_IIFE = readFileSync(
+  require.resolve("vue-demi/lib/index.iife.js"),
+  "utf-8"
+);
+
+/** @type {import('rollup').Plugin} */
+const injectVueDemi = {
+  name: "inject-vue-demi",
+  banner() {
+    return `${VUE_DEMI_IIFE};\n;`;
+  }
+};
+
 /** @type {import('rollup').RollupOptions} */
 const options = [
   {
@@ -50,7 +64,7 @@ const options = [
     ]
   },
   {
-    input: "src/all.ts",
+    input: "src/global.ts",
     plugins: [resolve(), typescript(), postcss()],
     external: ["vue-demi", "echarts", "echarts/core"],
     output: [
@@ -58,19 +72,20 @@ const options = [
         file: "dist/index.umd.js",
         format: "umd",
         name: "VueECharts",
-        exports: "named",
+        exports: "default",
         sourcemap: true,
         globals: {
           "vue-demi": "VueDemi",
           echarts: "echarts",
           "echarts/core": "echarts"
-        }
+        },
+        plugins: [injectVueDemi]
       },
       {
         file: "dist/index.umd.min.js",
         format: "umd",
         name: "VueECharts",
-        exports: "named",
+        exports: "default",
         sourcemap: true,
         globals: {
           "vue-demi": "VueDemi",
@@ -78,6 +93,7 @@ const options = [
           "echarts/core": "echarts"
         },
         plugins: [
+          injectVueDemi,
           terser({
             format: {
               comments: false

scripts/readme.js

@@ -10,7 +10,6 @@ const CDN_PREFIX = "https://cdn.jsdelivr.net/npm/";
 const DEP_VERSIONS = {
   "vue@3": "3.0.5",
   "vue@2": "2.6.12",
-  "vue-demi": "0.7.0",
   "@vue/composition-api": "1.0.0-rc.2",
   echarts: "5.0.2",
   [name]: version
@@ -31,8 +30,8 @@ const README_FILES = ["README.md", "README.zh-Hans.md"].map(name =>
 );
 
 const markConfig = {
-  vue3Scripts: ["vue@3", "vue-demi", "echarts", name],
-  vue2Scripts: ["vue@2", "@vue/composition-api", "vue-demi", "echarts", name]
+  vue3Scripts: ["vue@3", "echarts", name],
+  vue2Scripts: ["vue@2", "@vue/composition-api", "echarts", name]
 };
 
 function exec() {

src/all.ts

@@ -1,5 +0,0 @@
-import "echarts";
-import ECharts from "./index";
-
-export default ECharts;
-export * from "./index";

src/global.ts

@@ -0,0 +1,7 @@
+import "echarts";
+import ECharts, * as exported from "./index";
+
+export default {
+  ...ECharts,
+  ...exported
+};