diff --git a/build/config.js b/build/config.js index 710405a45..60257749a 100644 --- a/build/config.js +++ b/build/config.js @@ -13,6 +13,7 @@ Object.keys(dependencies).forEach(function(key) { }); externals['element-ui/src/utils/clickoutside'] = 'element-ui/lib/utils/clickoutside'; +externals['element-ui/src/utils/date'] = 'element-ui/lib/utils/date'; 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['element-ui/src/utils/resize-event'] = 'element-ui/lib/utils/resize-event'; diff --git a/build/cooking.common.js b/build/cooking.common.js index 7529400ef..aa9a385e2 100644 --- a/build/cooking.common.js +++ b/build/cooking.common.js @@ -14,5 +14,5 @@ cooking.set({ cooking.add('output.filename', 'element-ui.common.js'); cooking.add('loader.js.exclude', config.jsexclude); - +cooking.add('vue.preserveWhitespace', false); module.exports = cooking.resolve(); diff --git a/build/cooking.component.js b/build/cooking.component.js index 9eb936041..3d8622fe0 100644 --- a/build/cooking.component.js +++ b/build/cooking.component.js @@ -15,4 +15,5 @@ cooking.set({ cooking.add('output.filename', '[name]/index.js'); cooking.add('loader.js.exclude', config.jsexclude); +cooking.add('vue.preserveWhitespace', false); module.exports = cooking.resolve(); diff --git a/build/cooking.conf.js b/build/cooking.conf.js index c49a3b30d..c369d9cd5 100644 --- a/build/cooking.conf.js +++ b/build/cooking.conf.js @@ -14,5 +14,5 @@ cooking.set({ cooking.add('output.filename', 'index.js'); cooking.add('loader.js.exclude', config.jsexclude); - +cooking.add('vue.preserveWhitespace', false); module.exports = cooking.resolve(); diff --git a/build/cooking.demo.js b/build/cooking.demo.js index 8737773a1..9fcf59ba2 100644 --- a/build/cooking.demo.js +++ b/build/cooking.demo.js @@ -91,4 +91,5 @@ if (process.env.NODE_ENV === 'production') { cooking.add('externals.vue-router', 'VueRouter'); } +cooking.add('vue.preserveWhitespace', false); module.exports = cooking.resolve(); diff --git a/build/cooking.test.js b/build/cooking.test.js index 9385f9a4b..880923952 100644 --- a/build/cooking.test.js +++ b/build/cooking.test.js @@ -24,4 +24,5 @@ cooking.add('preLoader.0', { if (!process.env.CI_ENV) { cooking.add('plugins.process', new ProgressBarPlugin()); } +cooking.add('vue.preserveWhitespace', false); module.exports = cooking.resolve(); diff --git a/package.json b/package.json index 3122b0177..26dda100d 100644 --- a/package.json +++ b/package.json @@ -99,8 +99,8 @@ "theaterjs": "^3.0.0", "uppercamelcase": "^1.1.0", "url-loader": "^0.5.7", - "vue": "^2.0.2", - "vue-loader": "^9.5.1", + "vue": "^2.0.3", + "vue-loader": "^9.7.0", "vue-markdown-loader": "^0.5.1", "vue-router": "^2.0.0", "webpack": "^1.13.2",