remove unused file, update readme/changelog

CHANGELOG.md

@@ -1,5 +1,7 @@
-2.4.2
+2.5.0
 * Fixed collision with Vue's internal methods by removing `_` prefix.
+* `mergeOptions` now accept same arguments as ECharts' `setOption` method.
+* Updated ECharts dependency to 3.7.2+.
 
 2.4.1
 * Made `theme` reactive.

README.md

@@ -2,7 +2,7 @@
 
 > ECharts component for Vue.js.
 
-Built upon [ECharts](http://echarts.baidu.com/index.html) `v3.3.2`+ and depends on [Vue.js](https://vuejs.org/) `v2.0.1`+.
+Built upon [ECharts](http://echarts.baidu.com/index.html) `v3.7.2`+ and depends on [Vue.js](https://vuejs.org/) `v2.2.6`+.
 
 ## Installation
 
@@ -14,7 +14,7 @@ Just download `dist/vue-echarts.js` and include it in your HTML file:
 <script src="path/to/vue-echarts/dist/vue-echarts.js"></script>
 ```
 
-### npm 
+### npm
 
 ```bash
 $ npm install vue-echarts

build/fa2json.js

@@ -1,27 +0,0 @@
-var fs = require('fs');
-var path = require('path');
-
-var fa2svg = require('font-awesome-svg');
-var svgDir = path.resolve(__dirname, '../assets/svg');
-fa2svg(svgDir);
-
-var icons = {};
-fs.readdirSync(svgDir).forEach(function (file) {
-    var svg = fs.readFileSync(path.resolve(svgDir, file), 'utf8');
-    var sizeMatch = svg.match(/ viewBox="0 0 (\d+) (\d+)"/);
-    var dMatch = svg.match(/ d="([^"]+)"/);
-    if (!sizeMatch || !dMatch) {
-        return;
-    }
-    var icon = {};
-    var name = file.replace(/^fa-/, '').replace(/\.svg$/, '');
-    icons[name] = {
-        width: parseInt(sizeMatch[1], 10),
-        height: parseInt(sizeMatch[2], 10),
-        paths: [{
-            d: dMatch[1]
-        }]
-    };
-});
-
-fs.writeFileSync(path.resolve(__dirname, '../assets/icons.json'), JSON.stringify(icons, null, '  '));

build/icon.tpl

@@ -1,3 +0,0 @@
-import Icon from '../components/Icon.vue'
-
-Icon.register(${icon})

build/icons.js

@@ -1,18 +0,0 @@
-var fs = require('fs');
-var path = require('path');
-var icons = require('../assets/icons.json');
-
-var moduleTpl = fs.readFileSync(path.resolve(__dirname, './icon.tpl'), 'utf8');
-var ICON_PATH = path.resolve(__dirname, '../src/icons');
-
-var indexModule = '';
-var names = Object.keys(icons);
-names.forEach(function (name) {
-    var icon = {};
-    icon[name] = icons[name];
-    fs.writeFileSync(ICON_PATH + '/' + name + '.js', moduleTpl.replace('${icon}', JSON.stringify(icon)));
-    indexModule += 'import \'./' + name + '\'\n';
-})
-
-fs.writeFileSync(ICON_PATH + '/index.js', indexModule);
-console.log(names.length + ' icon modules generated.');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-echarts",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "description": "ECharts component for Vue.js.",
   "main": "dist/vue-echarts.js",
   "scripts": {
@@ -16,7 +16,7 @@
   "author": "Justineo (justice360@gmail.com)",
   "license": "MIT",
   "dependencies": {
-    "echarts": "^3.6.0",
+    "echarts": "^3.7.2",
     "lodash.debounce": "^4.0.8"
   },
   "peerDependencies": {
@@ -47,8 +47,6 @@
     "express": "^4.14.1",
     "extract-text-webpack-plugin": "^2.0.0",
     "file-loader": "^0.11.1",
-    "font-awesome": "^4.7.0",
-    "font-awesome-svg": "^0.4.0",
     "friendly-errors-webpack-plugin": "^1.1.3",
     "html-webpack-plugin": "^2.28.0",
     "http-proxy-middleware": "^0.17.3",
@@ -57,18 +55,19 @@
     "ora": "^1.2.0",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.6.0",
-    "rollup-plugin-buble": "^0.15.0",
+    "rollup-plugin-buble": "^0.17.0",
-    "rollup-plugin-commonjs": "^8.0.2",
+    "rollup-plugin-commonjs": "^8.2.6",
     "rollup-plugin-node-resolve": "^3.0.0",
-    "rollup-plugin-uglify": "^1.0.2",
+    "rollup-plugin-uglify": "^2.0.1",
-    "rollup-plugin-vue": "^2.3.1",
+    "rollup-plugin-vue": "^2.5.2",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "stylus-loader": "^3.0.1",
     "url-loader": "^0.5.8",
-    "vue-loader": "^11.3.4",
+    "vue": "^2.5.3",
+    "vue-loader": "^13.4.0",
     "vue-style-loader": "^2.0.5",
-    "vue-template-compiler": "^2.2.6",
+    "vue-template-compiler": "^2.5.3",
     "vuex": "^2.3.1",
     "webpack": "^2.3.3",
     "webpack-bundle-analyzer": "^2.2.1",