From d2e709bb113da69c0176215da6c969401da0a521 Mon Sep 17 00:00:00 2001
From: Thomas Vantuycom <thomasvantuycom@protonmail.com>
Date: Tue, 2 Jan 2018 23:39:34 +0100
Subject: [PATCH] Drop dependency on deprecated `gulp-util`

Closes #278
---
 packages/fbjs-scripts/gulp/check-dependencies.js   | 14 +++++++-------
 packages/fbjs-scripts/gulp/module-map.js           |  8 ++++----
 .../fbjs-scripts/gulp/strip-provides-module.js     |  4 ++--
 packages/fbjs-scripts/package.json                 |  4 +++-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/fbjs-scripts/gulp/check-dependencies.js b/packages/fbjs-scripts/gulp/check-dependencies.js
index 0efaa585..d226f20e 100644
--- a/packages/fbjs-scripts/gulp/check-dependencies.js
+++ b/packages/fbjs-scripts/gulp/check-dependencies.js
@@ -7,13 +7,13 @@
 
 'use strict';
 
-var gutil = require('gulp-util');
 var path = require('path');
 var semver = require('semver');
 var spawn = require('cross-spawn');
 var through = require('through2');
-
-var colors = gutil.colors;
+var PluginError = require('plugin-error');
+var colors = require('ansi-colors');
+var fancyLog = require('fancy-log');
 
 var PLUGIN_NAME = 'check-dependencies';
 
@@ -39,7 +39,7 @@ module.exports = function(opts) {
       try {
         var outdatedData = JSON.parse(data);
       } catch (e) {
-        cb(new gutil.PluginError(PLUGIN_NAME, 'npm broke'));
+        cb(new PluginError(PLUGIN_NAME, 'npm broke'));
       }
 
       var failures = [];
@@ -49,7 +49,7 @@ module.exports = function(opts) {
         var requested = pkgData[type][name];
 
         if (!requested) {
-          gutil.log('Found extraneous outdated dependency. Consider running `npm prune`');
+          fancyLog('Found extraneous outdated dependency. Consider running `npm prune`');
           return;
         }
 
@@ -61,7 +61,7 @@ module.exports = function(opts) {
 
       if (failures.length) {
         failures.forEach((failure) => {
-          gutil.log(
+          fancyLog(
             `${colors.bold(failure.name)} is outdated ` +
             `(${colors.red(failure.current)} does not satisfy ` +
             `${colors.yellow(failure.requested)})`
@@ -70,7 +70,7 @@ module.exports = function(opts) {
         var msg =
           'Some of your dependencies are outdated. Please run ' +
           `${colors.bold('npm update')} to ensure you are up to date.`;
-        cb(new gutil.PluginError(PLUGIN_NAME, msg));
+        cb(new PluginError(PLUGIN_NAME, msg));
         return;
       }
 
diff --git a/packages/fbjs-scripts/gulp/module-map.js b/packages/fbjs-scripts/gulp/module-map.js
index 85b08547..6f413274 100644
--- a/packages/fbjs-scripts/gulp/module-map.js
+++ b/packages/fbjs-scripts/gulp/module-map.js
@@ -7,7 +7,7 @@
 
 'use strict';
 
-var gutil = require('gulp-util');
+var PluginError = require('plugin-error');
 var through = require('through2');
 var fs = require('fs');
 var path = require('path');
@@ -19,7 +19,7 @@ var PLUGIN_NAME = 'module-map';
 module.exports = function(opts) {
   // Assume file is a string for now
   if (!opts || !('moduleMapFile' in opts && 'prefix' in opts)) {
-    throw new gutil.PluginError(
+    throw new PluginError(
       PLUGIN_NAME,
       'Missing options. Ensure you pass an object with `moduleMapFile` and `prefix`'
     );
@@ -35,7 +35,7 @@ module.exports = function(opts) {
     }
 
     if (file.isStream()) {
-      cb(new gutil.PluginError('module-map', 'Streaming not supported'));
+      cb(new PluginError('module-map', 'Streaming not supported'));
       return;
     }
 
@@ -46,7 +46,7 @@ module.exports = function(opts) {
       if (moduleMap.hasOwnProperty(name)) {
         this.emit(
           'error',
-          new gutil.PluginError(
+          new PluginError(
             PLUGIN_NAME,
             'Duplicate module found: ' + name + ' at ' + file.path + ' and ' +
               moduleMap[name]
diff --git a/packages/fbjs-scripts/gulp/strip-provides-module.js b/packages/fbjs-scripts/gulp/strip-provides-module.js
index 98a8dc1e..0da00463 100644
--- a/packages/fbjs-scripts/gulp/strip-provides-module.js
+++ b/packages/fbjs-scripts/gulp/strip-provides-module.js
@@ -7,7 +7,7 @@
 
 'use strict';
 
-var gutil = require('gulp-util');
+var PluginError = require('plugin-error');
 var through = require('through2');
 var PM_REGEXP = require('./shared/provides-module').regexp;
 
@@ -19,7 +19,7 @@ module.exports = function(opts) {
     }
 
     if (file.isStream()) {
-      cb(new gutil.PluginError('module-map', 'Streaming not supported'));
+      cb(new PluginError('module-map', 'Streaming not supported'));
       return;
     }
 
diff --git a/packages/fbjs-scripts/package.json b/packages/fbjs-scripts/package.json
index 21f04466..9b8eab29 100644
--- a/packages/fbjs-scripts/package.json
+++ b/packages/fbjs-scripts/package.json
@@ -5,12 +5,14 @@
   "repository": "facebook/fbjs",
   "license": "MIT",
   "dependencies": {
+    "ansi-colors": "^1.0.1",
     "babel-core": "^6.7.2",
     "babel-preset-fbjs": "^2.1.2",
     "core-js": "^2.4.1",
     "cross-spawn": "^5.1.0",
-    "gulp-util": "^3.0.4",
+    "fancy-log": "^1.3.2",
     "object-assign": "^4.0.1",
+    "plugin-error": "^0.1.2",
     "semver": "^5.1.0",
     "through2": "^2.0.0"
   }