danog/inline-critical
1
0
Fork 0
mirror of https://github.com/danog/inline-critical.git synced 2024-11-30 04:29:07 +01:00
Code Issues Projects Releases Wiki Activity

Update to loadcss v1.2.0 + cssrelpreload

Browse Source
This commit is contained in:
Ben Zörb 2016-04-14 22:36:45 +02:00
parent 0f76755b07
commit 839ded74d2
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
index.js
View File

@ -9,7 +9,6 @@
* All rights reserved.
*/
'use strict';
var fs = require('fs');
var path = require('path');
var _ = require('lodash');
@ -24,14 +23,22 @@ var slash = require('slash');
var normalizeNewline = require('normalize-newline');
var resolve = require('resolve');
var loadCssMain = resolve.sync('fg-loadcss');
var loadCssBase = path.dirname(loadCssMain);
/**
* Get loadcss + cssrelpreload script
*
* @returns {string}
*/
function getScript() {
var loadCssMain = resolve.sync('fg-loadcss');
var loadCssBase = path.dirname(loadCssMain);
var loadCSS = read(loadCssMain) + read(path.join(loadCssBase, 'cssrelpreload.js'));
loadCSS = UglifyJS.minify(loadCSS, {fromString: true}).code;
var loadCSS = read(loadCssMain) + read(path.join(loadCssBase, 'cssrelpreload.js'));
return UglifyJS.minify(loadCSS, {fromString: true}).code;
}
/**
* Fixup slashes in file paths for windows
*
* @param {string} str
* @return {string}
*/
@ -48,16 +55,6 @@ function read(file) {
return fs.readFileSync(file, 'utf8');
}
function filter($, options, reject) {
return function (index, element) {
var href = $(element).attr('href');
var i = _.findIndex(options.ignore, function (arg) {
return _.isRegExp(arg) && arg.test(href) || arg === href;
});
return reject ? i === -1 : i !== -1;
};
}
module.exports = function (html, styles, options) {
var $ = cheerio.load(String(html), {
decodeEntities: false
@ -77,8 +74,14 @@ module.exports = function (html, styles, options) {
var ignored = $();
if (o.ignore) {
ignored = links.filter(filter($, o));
links = links.filter(filter($, o, true));
var tmp = _.partition(links, function (link) {
var href = $(link).attr('href');
return _.findIndex(options.ignore, function (arg) {
return _.isRegExp(arg) && arg.test(href) || arg === href;
}) === -1;
});
links = $(_.first(tmp));
ignored = $(_.last(tmp));
}
// minify if minify option is set
@ -127,9 +130,8 @@ module.exports = function (html, styles, options) {
noscript.before('<link rel="preload" href="' + hrefs[idx] + '" as="style" onload="this.rel=\'stylesheet\'">\n');
});
// build js block to load blocking stylesheets and insert it right before
// exposes async stylesheets as global asyncss array which could be used with onloadCSS
noscript.after('\n<script id="loadcss">\n' + loadCSS + '\n</script>\n');
// append loadcss
noscript.after('\n<script id="loadcss">\n' + getScript() + '\n</script>\n');
}
var dom = parse($.html());

2
package.json
View File

@ -35,7 +35,7 @@
"fg-loadcss": "1.2.0",
"get-stdin": "5.0.1",
"indent-string": "2.1.0",
"lodash": "4.11.0",
"lodash": "4.11.1",
"meow": "3.7.0",
"normalize-newline": "2.0.0",
"reaver": "2.0.0",

3
test/index.js
View File

@ -161,7 +161,6 @@ describe('Module: inline-critical', function () {
var out = inlineCritical(html, css, {minify: true, selector: 'title'});
expect(strip(out.toString('utf-8'))).to.be.equal(strip(expected));
done();
});
@ -173,7 +172,6 @@ describe('Module: inline-critical', function () {
var out = inlineCritical(html, css, {minify: true});
expect(strip(out.toString('utf-8'))).to.be.equal(strip(expected));
done();
});
@ -185,7 +183,6 @@ describe('Module: inline-critical', function () {
var out = inlineCritical(html, css, {minify: true});
expect(strip(out.toString('utf-8'))).to.be.equal(strip(expected));
done();
});
});