Skip to content

Allow to pass minimize options via query params #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 18, 2015
Merged

Allow to pass minimize options via query params #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6565c4
fix tests
morhetz Oct 27, 2015
ae7d908
pass query minimize options to html minifier
morhetz Oct 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var attrParse = require("./lib/attributesParser");
var SourceNode = require("source-map").SourceNode;
var loaderUtils = require("loader-utils");
var url = require("url");
var assign = require("object-assign");

function randomIdent() {
return "xxxHTMLLINKxxx" + Math.random() + Math.random() + "xxx";
Expand Down Expand Up @@ -57,16 +58,24 @@ module.exports = function(content) {
content.reverse();
content = content.join("");
if(typeof query.minimize === "boolean" ? query.minimize : this.minimize) {
content = htmlMinifier.minify(content, {
removeComments: query.removeComments !== false,
collapseWhitespace: query.collapseWhitespace !== false,
collapseBooleanAttributes: query.collapseBooleanAttributes !== false,
removeAttributeQuotes: query.removeAttributeQuotes !== false,
removeRedundantAttributes: query.removeRedundantAttributes !== false,
useShortDoctype: query.useShortDoctype !== false,
removeEmptyAttributes: query.removeEmptyAttributes !== false,
removeOptionalTags: query.removeOptionalTags !== false
var minimizeOptions = assign({}, query);

[
"removeComments",
"collapseWhitespace",
"collapseBooleanAttributes",
"removeAttributeQuotes",
"removeRedundantAttributes",
"useShortDoctype",
"removeEmptyAttributes",
"removeOptionalTags"
].forEach(function(name) {
if (typeof minimizeOptions[name] === "undefined") {
minimizeOptions[name] = true;
}
});

content = htmlMinifier.minify(content, minimizeOptions);
}
return "module.exports = " + JSON.stringify(content).replace(/xxxHTMLLINKxxx[0-9\.]+xxx/g, function(match) {
if(!data[match]) return match;
Expand Down
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
"author": "Tobias Koppers @sokra",
"description": "html loader module for webpack",
"dependencies": {
"html-minifier": "^0.7.2",
"source-map": "0.1.x",
"fastparse": "^1.0.0",
"loader-utils": "~0.2.2"
"html-minifier": "^0.7.2",
"loader-utils": "~0.2.2",
"object-assign": "^4.0.1",
"source-map": "0.1.x"
},
"devDependencies": {
"mocha": "1.17.x",
Expand Down
20 changes: 18 additions & 2 deletions test/loaderTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,24 @@ describe("loader", function() {
it("should minimize", function() {
loader.call({
minimize: true
}, '<!-- comment --><h3>#{number} {customer}</h3>\n<p> {title} </p>\n\t <!-- comment --> <img src="image.png" />').should.be.eql(
'module.exports = "<h3>#{number} {customer}</h3><p>{title}</p><img src=" + require("./image.png") + ">";'
}, '<!-- 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") + "\\\">";'
);
});
it("should preserve comments", function() {
loader.call({
minimize: true,
query: "?-removeComments"
}, '<!-- comment --><h3 customAttr="">#{number} {customer}</h3>\n<p> {title} </p>\n\t <!-- 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") + "\\\">";'
);
});
it("should treat attributes as case sensitive", function() {
loader.call({
minimize: true,
query: "?caseSensitive"
}, '<!-- 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") + "\\\">";'
);
});
it("should not translate root-relative urls (without root query)", function() {
Expand Down