update html-minifier & fix tests

yyx990803 · yyx990803 · commit 9fd7ef6fe6a1 · 2016-04-06T13:19:08.000-04:00
diff --git a/index.js b/index.js
@@ -75,16 +75,13 @@ module.exports = function(content) {
 			"useShortDoctype",
 			"keepClosingSlash",
 			"removeScriptTypeAttributes",
-			"removeStyleTypeAttributes",
+			"removeStyleTypeAttributes"
 		].forEach(function(name) {
 			if(typeof minimizeOptions[name] === "undefined") {
 				minimizeOptions[name] = true;
 			}
 		});
 
-		// required for Vue 1.0 shorthand syntax
-		minimizeOptions.customAttrSurround = [[/@/, new RegExp('')], [/:/, new RegExp('')]]
-
 		content = htmlMinifier.minify(content, minimizeOptions);
 	}
 
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "es6-templates": "^0.2.2",
     "fastparse": "^1.0.0",
-    "html-minifier": "^1.0.0",
+    "html-minifier": "^1.4.0",
     "loader-utils": "~0.2.2",
     "object-assign": "^4.0.1"
   },
diff --git a/test/loaderTest.js b/test/loaderTest.js
@@ -38,31 +38,31 @@ describe("loader", function() {
 		loader.call({
 			minimize: true
 		}, '<!-- comment --><h3 customAttr="">#{number} {customer}</h3>\n<p>   {title}   </p>\n\t <!-- comment --> <img src="image.png" />').should.be.eql(
-			'module.exports = "<h3 customattr=\\"\\">#{number} {customer}</h3> <p> {title} </p>  <img src=\\"\" + require("./image.png") + "\\\"/>";'
+			'module.exports = "<h3 customattr=\\"\\">#{number} {customer}</h3> <p> {title} </p> <img src=" + require("./image.png") + " />";'
 		);
 	});
 	// https://github.com/webpack/webpack/issues/752
 	it("should not remove attributes by default", function() {
 		loader.call({
 			minimize: true
 		}, '<input type="text" />').should.be.eql(
-			'module.exports = "<input type=\\"text\\"/>";'
+			'module.exports = "<input type=text />";'
 		);
 	});
 	it("should preserve comments", function() {
 		loader.call({
 			minimize: true,
 			query: "?-removeComments"
 		}, '<!-- comment --><h3 customAttr="">#{number} {customer}</h3><p>{title}</p><!-- comment --><img src="image.png" />').should.be.eql(
-			'module.exports = "<!-- comment --><h3 customattr=\\"\\">#{number} {customer}</h3><p>{title}</p><!-- comment --><img src=\\"\" + require("./image.png") + "\\\"/>";'
+			'module.exports = "<!-- comment --><h3 customattr=\\"\\">#{number} {customer}</h3><p>{title}</p><!-- comment --><img src=" + require("./image.png") + " />";'
 		);
 	});
 	it("should treat attributes as case sensitive", function() {
 		loader.call({
 			minimize: true,
 			query: "?caseSensitive"
 		}, '<!-- comment --><h3 customAttr="">#{number} {customer}</h3><p>{title}</p><!-- comment --><img src="image.png" />').should.be.eql(
-			'module.exports = "<h3 customAttr=\\"\\">#{number} {customer}</h3><p>{title}</p><img src=\\"\" + require("./image.png") + "\\\"/>";'
+			'module.exports = "<h3 customAttr=\\"\\">#{number} {customer}</h3><p>{title}</p><img src=" + require("./image.png") + " />";'
 		);
 	});
 	it("should accept complex options via a webpack config property", function() {
@@ -82,8 +82,8 @@ describe("loader", function() {
 	it('should minimize vue template', function () {
 	  loader.call({
 			minimize: true
-		}, '<div    :id="test"   @click="ok">\n  hihihi {{what}}   \n</div>').should.be.eql(
-			'module.exports = "<div :id=test @click=ok> hihihi {{what}} </div>";'
+		}, '<div    :id="test"   @click="ok">\n  hihihi {{what}}   \n</div><button :disabled="ok"></button>').should.be.eql(
+			'module.exports = "<div :id=test @click=ok> hihihi {{what}} </div><button :disabled=ok></button>";'
 		);
 	})
 	it("should not translate root-relative urls (without root query)", function() {
