Skip to content

Commit eb66929

Browse files
jorritXhmikosR
authored andcommittedJul 27, 2017
Use new rebase configuration for clean-css@4 (#296)
The options target and relativeTo have been replaced by rebaseTo.
1 parent 5404a77 commit eb66929

File tree

5 files changed

+24
-2
lines changed

5 files changed

+24
-2
lines changed
 

‎Gruntfile.js

+10
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ module.exports = function (grunt) {
5353
'test/fixtures/inner/input_inline_import.css'
5454
]
5555
}
56+
},
57+
rebase: {
58+
options: {
59+
rebase: true
60+
},
61+
files: {
62+
'tmp/rebase.css': [
63+
'test/fixtures/rebase.css'
64+
]
65+
}
5666
}
5767
},
5868
nodeunit: {

‎tasks/cssmin.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ module.exports = function (grunt) {
3737
var availableFiles = getAvailableFiles(file.src);
3838
var compiled = '';
3939

40-
options.target = file.dest;
41-
options.relativeTo = path.dirname(availableFiles[0] || '');
40+
options.rebaseTo = path.dirname(file.dest);
4241

4342
try {
4443
compiled = new CleanCSS(options).minify(availableFiles);

‎test/expected/rebase.css

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
body{background:url(../test/fixtures/test.jpg)}/*# sourceMappingURL=rebase.css.map */

‎test/fixtures/rebase.css

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
body {
2+
background: url('test.jpg');
3+
}

‎test/test.js

+9
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ exports.cssmin = {
3232
var result = readFileAndRemoveNewlines('tmp/absolute.css');
3333
test.equal(expect, result, 'should perform the standard tasks when given absolute paths');
3434

35+
test.done();
36+
},
37+
rebase: function(test) {
38+
test.expect(1);
39+
40+
var expect = readFileAndRemoveNewlines('test/expected/rebase.css');
41+
var result = readFileAndRemoveNewlines('tmp/rebase.css');
42+
test.equal(expect, result, 'should rebase url imports correctly');
43+
3544
test.done();
3645
}
3746
};

0 commit comments

Comments
 (0)
Please sign in to comment.