Skip to content

Clean rendered html output #449

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
bmuenzenmeyer merged 4 commits into from
Sep 23, 2016
Merged

Clean rendered html output #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8d70c5
Merge pull request #465 from pattern-lab/dev
bmuenzenmeyer Sep 2, 2016
f6becee
feat: clean html at rendering
gael-boyenval Aug 24, 2016
8467b20
fix: move html cleaner to a more apropriate place
gael-boyenval Sep 2, 2016
a6f4d9c
feat: optionate cleanHtmlOutput
gael-boyenval Sep 2, 2016
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
10 changes: 7 additions & 3 deletions core/lib/patternlab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ var diveSync = require('diveSync'),
glob = require('glob'),
_ = require('lodash'),
path = require('path'),
plutils = require('./utilities');
plutils = require('./utilities'),
cleanHtml = require('js-beautify').html;

function buildPatternData(dataFilesPath, fs) {
var dataFiles = glob.sync(dataFilesPath + '*.json', {"ignore" : [dataFilesPath + 'listitems.json']});
Expand Down Expand Up @@ -386,13 +387,16 @@ var patternlab_engine = function (config) {

//write the compiled template to the public patterns directory
var patternPage = headHTML + pattern.patternPartialCode + footerHTML;
fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'rendered'), patternPage);
var cleanedPatternPage = config.cleanOutputHtml ? cleanHtml(patternPage) : patternPage;
var cleanedPatternPartialCode = config.cleanOutputHtml ? cleanHtml(pattern.patternPartialCode) : pattern.patternPartialCode;

fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'rendered'), cleanedPatternPage);

//write the mustache file too
fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'rawTemplate'), pattern.template);

//write the encoded version too
fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'markupOnly'), pattern.patternPartialCode);
fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'markupOnly'), cleanedPatternPartialCode);

return true;
});
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"diveSync": "^0.3.0",
"fs-extra": "^0.30.0",
"glob": "^7.0.0",
"js-beautify": "^1.6.3",
"js-yaml": "^3.6.1",
"json5": "^0.5.0",
"lodash": "~4.13.1",
Expand Down
3 changes: 2 additions & 1 deletion patternlab-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@
"rendered": ".rendered",
"rawTemplate": "",
"markupOnly": ".markup-only"
}
},
"cleanOutputHtml": true
}