浏览代码

Merge pull request #460 from QingWei-Li/fix/common-config

Fix build common config
baiyaaaaa 8 年之前
父节点
当前提交
45dc16e65f
共有 2 个文件被更改,包括 14 次插入8 次删除
  1. 13 7
      build/config.js
  2. 1 1
      build/cooking.conf.js

+ 13 - 7
build/config.js

@@ -1,5 +1,6 @@
 var Components = require('../components.json');
 var path = require('path');
+var dependencies = require('../package.json').dependencies;
 var externals = {};
 
 Object.keys(Components).forEach(function(key) {
@@ -7,18 +8,16 @@ Object.keys(Components).forEach(function(key) {
   externals[`element-ui/packages/${key}/style.css`] = `element-ui/lib/${key}/style.css`;
 });
 
+Object.keys(dependencies).forEach(function (key) {
+  externals[key] = key;
+});
+
 externals['element-ui/src/utils/clickoutside'] = 'element-ui/lib/utils/clickoutside';
 externals['element-ui/src/utils/popper'] = 'element-ui/lib/utils/popper';
 externals['element-ui/src/utils/vue-popper'] = 'element-ui/lib/utils/vue-popper';
-externals['vue-popup'] = 'vue-popup';
 
 exports.externals = Object.assign({
-  vue: {
-    root: 'Vue',
-    commonjs: 'vue',
-    commonjs2: 'vue',
-    amd: 'vue'
-  }
+  vue: 'vue'
 }, externals);
 
 exports.alias = {
@@ -28,4 +27,11 @@ exports.alias = {
   'element-ui': path.resolve(__dirname, '../')
 };
 
+exports.vue = {
+  root: 'Vue',
+  commonjs: 'vue',
+  commonjs2: 'vue',
+  amd: 'vue'
+};
+
 exports.jsexclude = /node_modules|utils\/popper\.js|utils\/date.\js/;

+ 1 - 1
build/cooking.conf.js

@@ -9,7 +9,7 @@ cooking.set({
   moduleName: 'ELEMENT',
   extends: ['vue2'],
   alias: config.alias,
-  externals: { vue: config.externals.vue }
+  externals: { vue: config.vue }
 });
 
 cooking.add('output.filename', 'index.js');