KevinMidboe/inline-html
1
0
Fork 0
mirror of https://github.com/KevinMidboe/inline-html.git synced 2025-10-29 17:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where urls in LESS were not rebased relative to the HTML filename.

Browse Source
This commit is contained in:
Alexandre Gigliotti
2015-12-02 10:56:10 -08:00
parent bde7bc9a0b
commit 897d87436a
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/link-less.js
View File

@@ -8,9 +8,16 @@ const Ru = require('@panosoft/ramda-utils');
const forEachIndexed = R.addIndex(R.forEach);
const render = R.curryN(2, co.wrap(function * (options, filename) {
options = R.merge(options || {}, { filename });
const contents = yield fs.readFile(filename, 'utf8');
const render = R.curryN(3, co.wrap(function * (options, basedir, href) {
const relativePath = path.relative(basedir, path.dirname(href));
const rootpath = relativePath ? `${relativePath}/` : false;
options = R.merge(options || {}, {
async: true,
relativeUrls: true,
filename: href,
rootpath
});
const contents = yield fs.readFile(href, 'utf8');
return yield less.render(contents, options);
}));
/**
@@ -26,7 +33,7 @@ const render = R.curryN(2, co.wrap(function * (options, filename) {
*/
const inlineLess = co.wrap(function * ($, filename, options) {
options = Ru.defaults({ less: {} }, options || {});
options = Ru.defaults({ relativeUrls: true }, options.less);
options = options.less;
const basedir = path.dirname(filename);
var files = [];
try {
@@ -36,7 +43,7 @@ const inlineLess = co.wrap(function * ($, filename, options) {
const getHref = element => path.resolve(basedir, $(element).attr('href'));
const hrefs = R.map(getHref, links);
files = R.concat(files, hrefs);
const outputs = yield R.map(render(options), hrefs);
const outputs = yield R.map(render(options, basedir), hrefs);
const imports = R.flatten(R.map(R.prop('imports'), outputs));
files = R.concat(files, imports);
const styles = R.map(output => $('<style>').html(output.css), outputs);