Disable html-minifier removeRedundantAttributes flag by default

yyx990803 · yyx990803 · commit 95954c08c845 · 2015-12-31T10:11:46.000-05:00
This avoid removing the "type" attribute on <input type="text"> as some CSS selectors may depend on the type attribute. Fixes #45. Also added the `htmlMinifier` field in config that allows the user to configure the behavior of the minifier.
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -9,6 +9,7 @@ var compilers = require('./compilers')
 var options = require('./compilers/options')
 var rewriteStyle = require('./style-rewriter')
 var rewriteTemplate = require('./template-rewriter')
+var assign = require('object-assign')
 var Emitter = require('events').EventEmitter
 
 // production minifiers
@@ -21,7 +22,9 @@ if (process.env.NODE_ENV === 'production') {
     removeComments: true,
     collapseBooleanAttributes: true,
     removeAttributeQuotes: true,
-    removeRedundantAttributes: true,
+    // this is disabled by default to avoid removing
+    // "type" on <input type="text">
+    removeRedundantAttributes: false,
     useShortDoctype: true,
     removeEmptyAttributes: true,
     removeOptionalTags: true
@@ -45,7 +48,9 @@ compiler.loadConfig = function () {
 compiler.applyConfig = function (config) {
   // copy user options to default options
   Object.keys(config).forEach(function (key) {
-    if (key !== 'customCompilers') {
+    if (key === 'htmlMinifier') {
+      htmlMinifyOptions = assign(htmlMinifyOptions, config[key])
+    } else if (key !== 'customCompilers') {
       options[key] = config[key]
     } else {
       // register compilers
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "cssnano": "^3.3.2",
     "es6-promise": "^3.0.2",
     "hash-sum": "^1.0.2",
-    "html-minifier": "^0.8.0",
+    "html-minifier": "^1.0.0",
     "lru-cache": "^2.7.0",
     "object-assign": "^4.0.1",
     "parse5": "^1.5.0",
diff --git a/test/expects/basic.js b/test/expects/basic.js
@@ -37,4 +37,4 @@ exports.default = {
   }
 };
 if (module.exports.__esModule) module.exports = module.exports.default
-;(typeof module.exports === "function"? module.exports.options: module.exports).template = "<h1 :id=id @click=hi>hello</h1>"
+;(typeof module.exports === "function"? module.exports.options: module.exports).template = "<h1 :id=id @click=hi>hello</h1><input type=text>"
diff --git a/test/fixtures/basic.vue b/test/fixtures/basic.vue
@@ -6,6 +6,7 @@
 
 <template>
   <h1 :id="id" @click="hi">hello</h1>
+  <input type="text">
 </template>
 
 <script>

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,4 @@ exports.default = {`
`37`	`37`	`}`
`38`	`38`	`};`
`39`	`39`	`if (module.exports.__esModule) module.exports = module.exports.default`
`40`		`-;(typeof module.exports === "function"? module.exports.options: module.exports).template = "<h1 :id=id @click=hi>hello</h1>"`
	`40`	`+;(typeof module.exports === "function"? module.exports.options: module.exports).template = "<h1 :id=id @click=hi>hello</h1><input type=text>"`