fix: … will transform to Object.assign by buble (#860)

ElemeFE · May 6, 2017 · 0b64280 · 0b64280
1 parent d687e57
commit 0b64280
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
@@ -9,18 +9,18 @@ var IMPORT_TEMPLATE = 'import {{name}} from \'../packages/{{package}}\';';
 var ISNTALL_COMPONENT_TEMPLATE = '  Vue.component({{name}}.name, {{name}});';
 var MAIN_TEMPLATE = `{{include}}
 import '../src/assets/font/iconfont.css';
+import merge from './utils/merge';
 
 const version = '{{version}}';
 const install = function(Vue, config = {}) {
   if (install.installed) return;
 
 {{install}}
   Vue.use(InfiniteScroll);
-  Vue.use(Lazyload, {
+  Vue.use(Lazyload, merge({
     loading: require('./assets/loading-spin.svg'),
-    attempt: 3,
-    ...config.lazyload
-  });
+    attempt: 3
+  }, config.lazyload));
 
   Vue.$messagebox = Vue.prototype.$messagebox = MessageBox;
   Vue.$toast = Vue.prototype.$toast = Toast;