From e425684f27d74bfd30d0957d21fd6c2ca4fb51ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Kishi?= Date: Wed, 2 Aug 2017 02:12:05 -0300 Subject: [PATCH 1/3] Enable `htmlMinifier.conservativeCollapse` --- src/options.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/options.js b/src/options.js index 0465531..3dcb356 100644 --- a/src/options.js +++ b/src/options.js @@ -17,6 +17,7 @@ export default { caseSensitive: true, customAttrSurround: [[/@/, new RegExp('')], [/:/, new RegExp('')]], collapseWhitespace: true, + conservativeCollapse: true, removeComments: true }, From 3c7907b0d36b5c5817c1f967028df04bcb9bed8d Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 26 Sep 2017 06:16:58 +0530 Subject: [PATCH 2/3] fix: trim white spaces from template code --- src/vueTransform.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vueTransform.js b/src/vueTransform.js index 83aa331..9ffc220 100644 --- a/src/vueTransform.js +++ b/src/vueTransform.js @@ -52,7 +52,7 @@ async function processTemplate (source, id, content, options, nodes, modules) { debug(`Process template: ${id}`) const extras = { modules, id, lang: source.attrs.lang } - const code = deIndent(source.code) + const code = deIndent(source.code).trim() const template = await ( options.disableCssModuleStaticReplacement !== true ? templateProcessor(code, extras, options) From 7f6c212127fb72284a7a7b3bb5794bdd8d5b5c0d Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 26 Sep 2017 06:17:46 +0530 Subject: [PATCH 3/3] refact: adjust test cases to `conservativeCollapse` option --- test/expects/basic.js | 2 +- test/expects/imports.js | 4 ++-- test/expects/slot.js | 2 +- test/expects/style.js | 2 +- test/expects/typescript-export-obj.js | 2 +- test/expects/typescript.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/expects/basic.js b/test/expects/basic.js index fb57293..007fa37 100755 --- a/test/expects/basic.js +++ b/test/expects/basic.js @@ -1,6 +1,6 @@ var evens = [2,4,6,8]; var odds = evens.map(v => v + 1); -var basic = { template: "

hello

", +var basic = { template: "

hello

", data() { return odds } diff --git a/test/expects/imports.js b/test/expects/imports.js index 7fbac11..2c8f346 100644 --- a/test/expects/imports.js +++ b/test/expects/imports.js @@ -1,12 +1,12 @@ var evens = [2,4,6,8]; var odds = evens.map(v => v + 1); -var Basic = { template: "

hello

", +var Basic = { template: "

hello

", data() { return odds } }; -var imports = { template: "
", +var imports = { template: "
", components: { Basic } diff --git a/test/expects/slot.js b/test/expects/slot.js index 011c321..fc2c9a2 100644 --- a/test/expects/slot.js +++ b/test/expects/slot.js @@ -1,6 +1,6 @@ var TableComponent = {render: function(){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('table',[_c('tr',[_c('td',[_vm._t("default")],2)])])},staticRenderFns: [],}; -var slot = {render: function(){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('table-component',[_vm._v("Hello! World")])},staticRenderFns: [], +var slot = {render: function(){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('table-component',[_vm._v(" Hello! World ")])},staticRenderFns: [], components: { TableComponent }, }; diff --git a/test/expects/style.js b/test/expects/style.js index 47c9178..adb6149 100755 --- a/test/expects/style.js +++ b/test/expects/style.js @@ -1,6 +1,6 @@ var evens = [2,4,6,8]; var odds = evens.map(v => v + 1); -var style = { template: "

hello

", +var style = { template: "

hello

", data() { return odds } diff --git a/test/expects/typescript-export-obj.js b/test/expects/typescript-export-obj.js index 8e3e669..ab6622d 100644 --- a/test/expects/typescript-export-obj.js +++ b/test/expects/typescript-export-obj.js @@ -1,7 +1,7 @@ var app = { }; -var __$app = Object.assign(app, { template: "

hello

",}); +var __$app = Object.assign(app, { template: "

hello

",}); __$app.prototype = app.prototype; export default __$app; diff --git a/test/expects/typescript.js b/test/expects/typescript.js index 97361f6..7744da7 100644 --- a/test/expects/typescript.js +++ b/test/expects/typescript.js @@ -1,4 +1,4 @@ -var component = { template: "

hello

", +var component = { template: "

hello

", data: function () { return ({ hello: 'world!' }); },