From 13250ea9729dd5be1b1fa04f59c8dbe6c7a1be41 Mon Sep 17 00:00:00 2001
From: Charles Samborski <demurgos@demurgos.net>
Date: Fri, 29 Dec 2017 23:39:41 +0100
Subject: [PATCH] Drop dependency on deprecated `gulp-util`

Closes slushjs/gulp-conflict#14
---
 .gitignore            |  2 ++
 index.js              | 17 +++++++++--------
 package.json          | 11 +++++++----
 test/conflict_test.js |  6 +++---
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index d99bfce..2187f6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .DS_Store
 node_modules/
 temp/
+package-lock.json
+yarn.lock
diff --git a/index.js b/index.js
index 140f840..55cf9d9 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,9 @@
 'use strict';
 var through2 = require('through2'),
     inquirer = require('inquirer'),
-    gutil = require('gulp-util'),
+    chalk = require('chalk'),
+    PluginError = require('plugin-error'),
+    fancyLog = require('fancy-log'),
     diff = require('diff'),
     fs = require('fs'),
     path = require('path'),
@@ -110,7 +112,7 @@ module.exports = function conflict (dest, opt) {
                 });
                 break;
               case 'end':
-                log(gutil.colors.red('Aborting...'));
+                log(chalk.red('Aborting...'));
                 process.exit(0);
                 break;
               case 'diff':
@@ -163,7 +165,7 @@ function diffFiles (newFile, oldFilePath) {
   try {
     var content = fs.readFileSync(oldFilePath, 'utf8');
     var differences = diff.diffLines(content, String(newFile.contents));
-    log('File differences: ' + gutil.colors.bgGreen('added') + ' ' + gutil.colors.bgRed('removed') + '\n\n' + differences.map(formatPart).join(''));
+    log('File differences: ' + chalk.bgGreen('added') + ' ' + chalk.bgRed('removed') + '\n\n' + differences.map(formatPart).join(''));
   } catch (err) {
     error('Reading old file for diff failed with: ' + err.message);
   }
@@ -172,7 +174,7 @@ function diffFiles (newFile, oldFilePath) {
 function formatPart (part, i) {
   var indent = new Array(8).join(' ');
   return (!i ? indent : '') + part.value.split('\n').map(function (line) {
-    return gutil.colors[colorFromPart(part)](line);
+    return chalk[colorFromPart(part)](line);
   }).join('\n' + indent);
 }
 
@@ -198,7 +200,7 @@ function logFile(options){
   if (!file || !file.relative || (stat && stat.isDirectory())) {
     return;
   }
-  var fileName = gutil.colors.magenta(file.relative);
+  var fileName = chalk.magenta(file.relative);
   if (extraText) {
     logger(message, fileName, extraText);
   } else {
@@ -210,15 +212,14 @@ function log () {
   if (isTest()) {
     return;
   }
-  var logger = gutil.log.bind(gutil, '[' + gutil.colors.cyan('conflict') + ']');
+  var logger = fancyLog.bind(null, '[' + chalk.cyan('conflict') + ']');
   logger.apply(logger, arguments);
 }
 
 function error (message) {
-  throw new gutil.PluginError(pkg.name, message);
+  throw new PluginError(pkg.name, message);
 }
 
 function isTest () {
   return process.env.NODE_ENV === 'test';
 }
-
diff --git a/package.json b/package.json
index 63dba71..aa91ac9 100644
--- a/package.json
+++ b/package.json
@@ -26,13 +26,16 @@
   },
   "homepage": "https://github.com/slushjs/gulp-conflict",
   "dependencies": {
-    "through2": "~0.6.3",
-    "gulp-util": "~3.0.1",
+    "chalk": "^2.3.0",
+    "diff": "^1.0.8",
+    "fancy-log": "^1.3.2",
     "inquirer": "~0.8.0",
-    "diff": "^1.0.8"
+    "plugin-error": "^0.1.2",
+    "through2": "~0.6.3"
   },
   "devDependencies": {
     "chai": "~1.10.0",
-    "mocha": "~2.0.1"
+    "mocha": "~2.0.1",
+    "vinyl": "^2.1.0"
   }
 }
diff --git a/test/conflict_test.js b/test/conflict_test.js
index 894180c..370530d 100644
--- a/test/conflict_test.js
+++ b/test/conflict_test.js
@@ -4,13 +4,13 @@ var chai = require('chai'),
     should = chai.should(),
     inquirer = require('inquirer'),
     diff = require('diff'),
-    gutil = require('gulp-util'),
+    Vinyl = require('vinyl'),
     path = require('path'),
     conflict = require('../.');
 
 function fixture (file) {
   var filepath = path.join(__dirname, file);
-  return new gutil.File({
+  return new Vinyl({
     path: filepath,
     cwd: __dirname,
     base: path.join(__dirname, path.dirname(file)),
@@ -224,7 +224,7 @@ describe('gulp-conflict', function () {
   });
 
   it('should not crash when folders exist in stream', function (done) {
-    var dir = new gutil.File({
+    var dir = new Vinyl({
       path: __dirname,
       cwd: __dirname,
       base: __dirname,