Merge remote-tracking branch 'prog1dev/master'

# Conflicts:
#	package.json

Author: roman.vasilev

gulp-cssimport.js

@@ -4,7 +4,8 @@ var path = require("path");
 var deepExtend = require("deep-extend");
 var fs = require("fs");
 var pify = require("pify");
-var gutil = require("gulp-util");
+var Vinyl = require("vinyl");
+var PluginError = require("plugin-error");
 var collect = require("collect-stream");
 var hh = require("http-https");
 var minimatch = require("minimatch");
@@ -100,7 +101,7 @@ module.exports = function cssImport(options) {
                     var importFile = resolveImportFile(pathDirectory, importPath, options.includePaths);
                     if (!importFile) {
                         var err = new Error("Cannot find file '" + importPath + "' from '" + pathDirectory + "' (includePaths: " + options.includePaths + ")");
-                        callback(new gutil.PluginError(PLUGIN_NAME, err));
+                        callback(new PluginError(PLUGIN_NAME, err));
                     }
                     promises[promises.length] = readFile(importFile, "utf8").then(function(contents) {
                         result.importFile = importFile;
@@ -138,7 +139,7 @@ module.exports = function cssImport(options) {
                     var result = results[i];
                     // Strip BOM.
                     result.contents = stripBom(result.contents);
-                    var vfile = new gutil.File({
+                    var vfile = new Vinyl({
                         path: result.importFile,
                         contents: new Buffer(result.contents)
                     });
@@ -181,7 +182,7 @@ module.exports = function cssImport(options) {
                 callback(null, vinyl);
             })
             .catch(function(err) {
-                callback(new gutil.PluginError(PLUGIN_NAME, err));
+                callback(new PluginError(PLUGIN_NAME, err));
             });
     }
 
@@ -264,4 +265,4 @@ function isUrl(s) {
 function getExtension(p) {
     p = String(p);
     return p.substr(p.lastIndexOf('.') + 1);
-}
+}

gulpfile.js

@@ -1,6 +1,7 @@
 var gulp = require("gulp");
 var gutil = require("gulp-util");
 var g = require("gulp-load-plugins")();
+var argv = require('minimist')(process.argv.slice(2));
 
 gulp.task("watch-eslint", ["eslint"], function() {
 	gulp.watch(["./gulp-cssimport.js"], ["eslint"]);
@@ -15,7 +16,6 @@ gulp.task("eslint", function() {
 });
 
 gulp.task("bump", function() {
-	var argv = gutil.env;
 	var options = {
 		type: "patch"
 	};
@@ -26,4 +26,4 @@ gulp.task("bump", function() {
 			.pipe(g.bump(options))
 			.pipe(gulp.dest("./"));
 	});
-});
+});

package.json

@@ -18,8 +18,10 @@
   ],
   "dependencies": {
     "collect-stream": "^1.2.1",
-    "deep-extend": "^0.6.0",
-    "gulp-util": "*",
+    "deep-extend": "^0.5.0",
+    "plugin-error": "^0.1.2",
+    "minimist": "^1.2.0",
+    "vinyl": "^2.1.0",
     "http-https": "^1.0.0",
     "lodash.trim": "^4.5.1",
     "lookup-path": "^0.3.1",