Skip to content

Commit 92ddf63

Browse files
committedMay 15, 2017
rebasing, clean-css 4.1.2
1 parent 0abeca5 commit 92ddf63

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed
 

‎index.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ module.exports = function gulpCleanCSS(options, callback) {
2626
if (file.sourceMap)
2727
options.sourceMap = JSON.parse(JSON.stringify(file.sourceMap));
2828

29-
if (options.rebaseTo) {
30-
31-
let relative = path.resolve(file.path, options.rebaseTo);
32-
options.rebaseTo = path.relative(relative, file.path)
33-
}
34-
35-
let style = file.contents ? file.contents.toString() : '';
29+
let style = {
30+
[file.path]: {
31+
styles: file.contents ? file.contents.toString() : ''
32+
}
33+
};
3634

3735
new CleanCSS(options).minify(style, function (errors, css) {
3836

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "gulp-clean-css",
33
"description": "Minify css with clean-css.",
44
"homepage": "https://github.com/scniro/gulp-clean-css#readme",
5-
"version": "3.1.1",
5+
"version": "3.2.0",
66
"author": "scniro",
77
"license": "MIT",
88
"bugs": {
@@ -29,7 +29,7 @@
2929
"gulpfriendly"
3030
],
3131
"dependencies": {
32-
"clean-css": "4.1.0",
32+
"clean-css": "4.1.2",
3333
"gulp-util": "3.0.8",
3434
"through2": "2.0.3",
3535
"vinyl-sourcemaps-apply": "0.2.1"
@@ -47,7 +47,7 @@
4747
"gulp-rename": "1.2.2",
4848
"gulp-sass": "3.1.0",
4949
"gulp-sourcemaps": "2.6.0",
50-
"mocha": "3.3.0",
50+
"mocha": "3.4.1",
5151
"vinyl": "2.0.2",
5252
"vinyl-buffer": "1.0.0",
5353
"vinyl-fs-fake": "1.1.0"

‎test/test.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ describe('gulp-clean-css: base functionality', function () {
226226
.pipe(cleanCSS({debug: true}, function (details) {
227227
expect(details.warnings).to.exist &&
228228
expect(details.warnings.length).to.equal(1) &&
229-
expect(details.warnings[0]).to.equal('Missing \'}\' at 1:14.');
229+
expect(details.warnings[0]).to.equal('Missing \'}\' at fixtures/test.css:1:14.');
230230
}))
231231
.on('data', function (file) {
232232
i += 1;
@@ -273,10 +273,10 @@ describe('gulp-clean-css: rebase', function () {
273273
.on('data', function (file) {
274274

275275
let expected = `
276-
p.insub_same{background:url(insub.png)}
277-
p.insub_child{background:url(child/child.png)}
278-
p.insub_parent{background:url(../parent.png)}
279-
p.insub_other{background:url(../othersub/inother.png)}
276+
p.insub_same{background:url(test/fixtures/rebasing/subdir/insub.png)}
277+
p.insub_child{background:url(test/fixtures/rebasing/subdir/child/child.png)}
278+
p.insub_parent{background:url(test/fixtures/rebasing/parent.png)}
279+
p.insub_other{background:url(test/fixtures/rebasing/othersub/inother.png)}
280280
p.insub_absolute{background:url(/inroot.png)}`;
281281

282282
let actual = file.contents.toString();
@@ -288,15 +288,15 @@ describe('gulp-clean-css: rebase', function () {
288288

289289
it('should by rebase files with target specified', function (done) {
290290
gulp.src(['test/fixtures/rebasing/subdir/insub.css'])
291-
.pipe(cleanCSS({rebaseTo: '..'}))
291+
.pipe(cleanCSS({rebaseTo: 'test'}))
292292
.on('data', function (file) {
293293

294294
let expected = `
295-
p.insub_same{background:url(../insub.png)}
296-
p.insub_child{background:url(../child/child.png)}
297-
p.insub_parent{background:url(../../parent.png)}
298-
p.insub_other{background:url(../../othersub/inother.png)}
299-
p.insub_absolute{background:url(/inroot.png)}`;
295+
p.insub_same{background:url(fixtures/rebasing/subdir/insub.png)}
296+
p.insub_child{background:url(fixtures/rebasing/subdir/child/child.png)}
297+
p.insub_parent{background:url(fixtures/rebasing/parent.png)}
298+
p.insub_other{background:url(fixtures/rebasing/othersub/inother.png)}
299+
p.insub_absolute{background:url(/inroot.png)}`;
300300

301301
let actual = file.contents.toString();
302302

0 commit comments

Comments
 (0)
Please sign in to comment.