.travis.yml

@@ -1,24 +1,9 @@
 language: node_js
 node_js:
-  - "7.5"
-  - "7.4"
-  - "7.3"
-  - "7.2"
-  - "7.1"
+  - "9"
+  - "8"
   - "7"
-  - "6.9"
-  - "6.8"
-  - "6.7"
-  - "6.6"
-  - "6.5"
-  - "6.4"
-  - "6.3"
-  - "6.2"
   - "6"
   - "5"
-  - "5.1"
   - "4"
-  - "4.2"
-  - "4.1"
-  - "4.0"
 after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"

README.md

@@ -1,11 +1,13 @@
 # gulp-clean-css
 
 [![Build Status](https://img.shields.io/travis/scniro/gulp-clean-css.svg?style=flat-square)](https://travis-ci.org/scniro/gulp-clean-css)
-[![NPM Version](https://img.shields.io/npm/v/gulp-clean-css.svg?style=flat-square)](https://www.npmjs.com/package/gulp-clean-css)
 [![Dependency Status](https://img.shields.io/david/scniro/gulp-clean-css.svg?label=deps&style=flat-square)](https://david-dm.org/scniro/gulp-clean-css)
 [![devDependency Status](https://img.shields.io/david/dev/scniro/gulp-clean-css.svg?label=devDeps&style=flat-square)](https://david-dm.org/scniro/gulp-clean-css#info=devDependencies)
 [![Coverage](https://img.shields.io/coveralls/scniro/gulp-clean-css.svg?style=flat-square)](https://coveralls.io/github/scniro/gulp-clean-css)
 [![Climate](https://img.shields.io/codeclimate/github/scniro/gulp-clean-css.svg?label=climate&style=flat-square)](https://codeclimate.com/github/scniro/gulp-clean-css)
+[![Downloads](https://img.shields.io/npm/dm/gulp-clean-css.svg?style=flat-square)](https://www.npmjs.com/package/gulp-clean-css)
+[![NPM Version](https://img.shields.io/npm/v/gulp-clean-css.svg?style=flat-square)](https://www.npmjs.com/package/gulp-clean-css)
+[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/alferov/awesome-gulp#minification)
 
 > [gulp](http://gulpjs.com/) plugin to minify CSS, using [clean-css](https://github.com/jakubpawlowicz/clean-css)
 
@@ -28,10 +30,10 @@ npm install gulp-clean-css --save-dev
 See the [`CleanCSS` options](https://github.com/jakubpawlowicz/clean-css#how-to-use-clean-css-api).
 
 ```javascript
-var gulp = require('gulp');
-var cleanCSS = require('gulp-clean-css');
+let gulp = require('gulp');
+let cleanCSS = require('gulp-clean-css');
 
-gulp.task('minify-css', function() {
+gulp.task('minify-css', () => {
   return gulp.src('styles/*.css')
     .pipe(cleanCSS({compatibility: 'ie8'}))
     .pipe(gulp.dest('dist'));
@@ -43,36 +45,36 @@ gulp.task('minify-css', function() {
 Useful for returning details from the underlying [`minify()`](https://github.com/jakubpawlowicz/clean-css#using-api) call. An example use case could include logging `stats` of the minified file. In addition to the default object, `gulp-clean-css` provides the file `name` and `path` for further analysis.
 
 ```javascript
-var gulp = require('gulp');
-var cleanCSS = require('gulp-clean-css');
-
-gulp.task('minify-css', function() {
-    return gulp.src('styles/*.css')
-        .pipe(cleanCSS({debug: true}, function(details) {
-            console.log(details.name + ': ' + details.stats.originalSize);
-            console.log(details.name + ': ' + details.stats.minifiedSize);
-        }))
-        .pipe(gulp.dest('dist'));
+let gulp = require('gulp');
+let cleanCSS = require('gulp-clean-css');
+
+gulp.task('minify-css', () => {
+  return gulp.src('styles/*.css')
+    .pipe(cleanCSS({debug: true}, (details) => {
+      console.log(`${details.name}: ${details.stats.originalSize}`);
+      console.log(`${details.name}: ${details.stats.minifiedSize}`);
+    }))
+  .pipe(gulp.dest('dist'));
 });
 ```
 
 [Source Maps](http://www.html5rocks.com/tutorials/developertools/sourcemaps/) can be generated by using [gulp-sourcemaps](https://github.com/floridoo/gulp-sourcemaps).
 
 ```javascript
 
-var gulp = require('gulp');
-var cleanCSS = require('gulp-clean-css');
-var sourcemaps = require('gulp-sourcemaps');
+let gulp = require('gulp');
+let cleanCSS = require('gulp-clean-css');
+let sourcemaps = require('gulp-sourcemaps');
 
-gulp.task('minify-css', function() {
-    return gulp.src('./src/*.css')
-        .pipe(sourcemaps.init())
-        .pipe(cleanCSS())
-        .pipe(sourcemaps.write())
-        .pipe(gulp.dest('dist'));
+gulp.task('minify-css',() => {
+  return gulp.src('./src/*.css')
+    .pipe(sourcemaps.init())
+    .pipe(cleanCSS())
+    .pipe(sourcemaps.write())
+    .pipe(gulp.dest('dist'));
 });
 ```
 
 ## License
 
-[MIT](./LICENSE) © 2016 [scniro](https://github.com/scniro)
+[MIT](./LICENSE) © 2017 [scniro](https://github.com/scniro)

gulpfile.js

@@ -1,20 +1,20 @@
 var gulp = require('gulp');
 var mocha = require('gulp-mocha');
-var gutil = require('gulp-util');
+var log = require('fancy-log');
 var istanbul = require('gulp-istanbul');
 
 gulp.task('pre-test', function () {
   return gulp.src(['index.js'])
-    .pipe(istanbul())
-    .pipe(istanbul.hookRequire());
+  .pipe(istanbul())
+  .pipe(istanbul.hookRequire());
 });
 
 gulp.task('test', ['pre-test'], function () {
   return gulp.src('test/*.js')
-    .pipe(mocha({reporter: 'list'}))
-    .pipe(istanbul.writeReports({
-      includeUntested: true,
-      reporters: ['lcov']
-    }))
-    .on('error', gutil.log);
+  .pipe(mocha({reporter: 'dot'}))
+  .pipe(istanbul.writeReports({
+    includeUntested: true,
+    reporters: ['lcov']
+  }))
+  .on('error', log);
 });

index.js

@@ -1,17 +1,19 @@
+'use strict';
+
 const applySourceMap = require('vinyl-sourcemaps-apply');
 const CleanCSS = require('clean-css');
 const path = require('path');
-const PluginError = require('gulp-util').PluginError;
+const PluginError = require('plugin-error');
 const through = require('through2');
 
 module.exports = function gulpCleanCSS(options, callback) {
 
-  options = options || {};
+  options = Object.assign(options || {});
 
   if (arguments.length === 1 && Object.prototype.toString.call(arguments[0]) === '[object Function]')
     callback = arguments[0];
 
-  var transform = function (file, enc, cb) {
+  let transform = function (file, enc, cb) {
 
     if (!file || !file.contents)
       return cb(null, file);
@@ -24,21 +26,25 @@ module.exports = function gulpCleanCSS(options, callback) {
     if (file.sourceMap)
       options.sourceMap = JSON.parse(JSON.stringify(file.sourceMap));
 
-    var style = file.contents ? file.contents.toString() : '';
+    let contents = file.contents ? file.contents.toString() : '';
+    let pass = {[file.path]: {styles: contents}};
+    if (!options.rebaseTo && options.rebase !== false) {
+      options.rebaseTo = path.dirname(file.path);
+    }
 
-    new CleanCSS(options).minify(style, function (errors, css) {
+    new CleanCSS(options).minify(pass, function (errors, css) {
 
       if (errors)
         return cb(errors.join(' '));
 
       if (typeof callback === 'function') {
-        var details = {
+        let details = {
           'stats': css.stats,
           'errors': css.errors,
           'warnings': css.warnings,
           'path': file.path,
           'name': file.path.split(file.base)[1]
-        }
+        };
 
         if (css.sourceMap)
           details['sourceMap'] = css.sourceMap;
@@ -50,7 +56,7 @@ module.exports = function gulpCleanCSS(options, callback) {
 
       if (css.sourceMap) {
 
-        var map = JSON.parse(css.sourceMap);
+        let map = JSON.parse(css.sourceMap);
         map.file = path.relative(file.base, file.path);
         map.sources = map.sources.map(function (src) {
           return path.relative(file.base, file.path)