Skip to content

fix css rel #16

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 1 commit into from
Apr 6, 2017
Merged

fix css rel #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Blocks are expressed as:
- **type**: either `js`, `css` or `remove`
- **alternate search path**: (optional) By default the input files are relative to the treated file. Alternate search path allows one to change that
- **path**: the file path of the optimized file, the target output
- **parameters**: extra parameters that should be added to the tag
- **parameters**: extra parameters that should be added to the tag. By default `rel="stylesheet"` attribute is added to css link tag, your can overwrite it by passing your own rel parameter, e.g. `rel="preload"`

An example of this in completed form can be seen below:

Expand Down
12 changes: 10 additions & 2 deletions lib/refManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,25 @@ module.exports = {

transformCSSRefs: function (block, target, attbs) {
var ref = '';
var rel = 'rel="stylesheet" ';

// css link element regular expression
// TODO: Determine if 'href' attribute is present.
var regcss = /<?link.*?(?:>|\))/gmi;

// rel attribute regular expression
var regrel = /(^|\s)rel=/i;
// if rel exists in attributes, set the default one empty
if (regrel.test(attbs)) {
rel = '';
}

// Check to see if there are any css references at all.
if (block.search(regcss) !== -1) {
if (attbs) {
ref = '<link rel="stylesheet" href="' + target + '" ' + attbs + '>';
ref = '<link ' + rel + 'href="' + target + '" ' + attbs + '>';
} else {
ref = '<link rel="stylesheet" href="' + target + '">';
ref = '<link ' + rel + 'href="' + target + '">';
}
}

Expand Down
6 changes: 6 additions & 0 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ describe('html-ref-replace', function() {
expect(result[1]).to.eql({ css: { '/css/combined.css': { 'assets': [ '/css/one.css', '/css/two.css' ] }}});
});

it('should replace css blocks with rel', function() {
var result = useRef(fread(djoin('testfiles/15-rel.html')));
expect(result[0]).to.equal(fread(djoin('testfiles/15-rel-expected.html')));
expect(result[1]).to.eql({ css: { '/css/combined.css': { 'assets': [ '/css/one.css', '/css/two.css' ] }}});
});

it('should reserve IE conditional comments', function() {
var result = useRef(fread(djoin('testfiles/16.html')));
expect(result[0]).to.equal(fread(djoin('testfiles/16-expected.html')));
Expand Down
5 changes: 5 additions & 0 deletions test/testfiles/15-rel-expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<html>
<head>
<link href="/css/combined.css" rel="preload" media="print">
</head>
</html>
8 changes: 8 additions & 0 deletions test/testfiles/15-rel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<html>
<head>
<!-- build:css /css/combined.css rel="preload" media="print" -->
<link href="/css/one.css" rel="preload" media="print">
<link href="/css/two.css" rel="preload" media="print">
<!-- endbuild -->
</head>
</html>