修改：object-assign处理方式

ElemeFE · Sep 14, 2017 · b650992 · b650992
1 parent c645376
commit b650992
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 45 deletions.
diff --git a/.babelrc b/.babelrc
@@ -4,5 +4,6 @@
       "es2015": { "modules": false }
     }],
     "stage-2"
-  ]
+  ],
+  "plugins": ["transform-object-assign"]
 }
diff --git a/docs/v-charts.min.js b/docs/v-charts.min.js
diff --git a/package.json b/package.json
@@ -32,6 +32,7 @@
     "babel-eslint": "7.1.1",
     "babel-loader": "6.4.1",
     "babel-plugin-external-helpers": "6.22.0",
+    "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-latest": "6.24.0",
     "babel-preset-stage-2": "6.22.0",

diff --git a/src/echarts-base.js b/src/echarts-base.js
@@ -1,7 +1,6 @@
 import echarts from 'echarts/lib/echarts'
 import 'echarts/lib/component/tooltip'
 import 'echarts/lib/component/legend'
-import './object-assign.js'
 
 echarts.registerTheme('ve-chart', {
   categoryAxis: {

diff --git a/src/object-assign.js b/src/object-assign.js
diff --git a/test/index.js b/test/index.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 import Vue from 'vue'
 import chartData from '../examples/test-data/index.js'
 import 'echarts/lib/component/tooltip'

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -2,7 +2,6 @@ module.exports = function (config) {
   config.set({
     frameworks: ['jasmine'],
     files: [
-      './polyfill.js',
       './index.js'
     ],
     browsers: ['PhantomJS'],

diff --git a/test/polyfill.js b/test/polyfill.js
diff --git a/yarn.lock b/yarn.lock
@@ -672,6 +672,12 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-object-assign@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-assign/-/babel-plugin-transform-object-assign-6.22.0.tgz#f99d2f66f1a0b0d498e346c5359684740caa20ba"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-object-rest-spread@^6.22.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"