From 9d9c4874eed6838c77e85c4ac8c396e13673fb79 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:09:42 +0100 Subject: [PATCH 01/16] sc: mod: gitignore file - package-lock.json --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8bb4859..5380e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ node_modules/ .settings npm-debug.log Desktop.ini -Thumbs.db \ No newline at end of file +Thumbs.db +package-lock.json \ No newline at end of file From 8a01e7ee1f30e1ebee422533e88c7e57c5ef6ca8 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:15:38 +0100 Subject: [PATCH 02/16] sc mod: package.json - add: dep. plugin-error --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d74d26a..7b33abf 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "test": "mocha -R spec src/**/*.spec.js" }, "dependencies": { - "through2": "^2.0.1", - "gulp-util": "^3.0.0", "escape-string-regexp": "^1.0.5", - "event-stream": "^3.1.0" + "event-stream": "^3.1.0", + "gulp-util": "^3.0.0", + "plugin-error": "^0.1.2", + "through2": "^2.0.1" }, "devDependencies": { "mocha": "~2.0.1", From 1e96d2124dfbbdba6584e365143ee57703bae898 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:15:55 +0100 Subject: [PATCH 03/16] sc mod: index.js - plugin-error repalcement for gutil.pluginError --- src/index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 5789a37..8ef4565 100644 --- a/src/index.js +++ b/src/index.js @@ -1,4 +1,8 @@ 'use strict'; + +//2018-01-02 sc mod: gulp-util deprecation +//2018-01-02 sc mod: require plugin-error to replace gutil.PluginError + var through = require('through2'); var gutil = require('gulp-util'); var path = require('path'); @@ -7,6 +11,7 @@ var escapeStringRegexp = require('escape-string-regexp'); var magenta = gutil.colors.magenta; var cyan = gutil.colors.cyan; var red = gutil.colors.red; +var PluginError = require('plugin-error'); /** * Constants @@ -244,7 +249,7 @@ function bool(options, prop, defaultVal) { * @returns {*} */ function error(message) { - return new gutil.PluginError(PLUGIN_NAME, message); + return new PluginError(PLUGIN_NAME, message); } /** From 4b01228da4bbc5a294a55ed4f742b073c17eb4ab Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:17:32 +0100 Subject: [PATCH 04/16] sc mod: package.json - add: dep. fancy-log --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 7b33abf..0a33d3c 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "dependencies": { "escape-string-regexp": "^1.0.5", "event-stream": "^3.1.0", + "fancy-log": "^1.3.2", "gulp-util": "^3.0.0", "plugin-error": "^0.1.2", "through2": "^2.0.1" From b5d54a392f13c5694b0c28d6a5026632e9d54e48 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:19:07 +0100 Subject: [PATCH 05/16] sc mod: index.js - fancy-log repalcement for gutil.log --- src/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 8ef4565..5e14cac 100644 --- a/src/index.js +++ b/src/index.js @@ -2,6 +2,7 @@ //2018-01-02 sc mod: gulp-util deprecation //2018-01-02 sc mod: require plugin-error to replace gutil.PluginError +//2018-01-02 sc mod: require fancy-log to replace gutil.log var through = require('through2'); var gutil = require('gulp-util'); @@ -12,6 +13,7 @@ var magenta = gutil.colors.magenta; var cyan = gutil.colors.cyan; var red = gutil.colors.red; var PluginError = require('plugin-error'); +var log = require('fancy-log'); /** * Constants @@ -256,7 +258,7 @@ function error(message) { * @param message */ function log(message) { - gutil.log(magenta(PLUGIN_NAME), message); + log(magenta(PLUGIN_NAME), message); } /** From cbe16aefdf768dfdd31488d648ed32144405b19d Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:23:11 +0100 Subject: [PATCH 06/16] sc mod: package.json - add: dep. ansi-colors --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 0a33d3c..a066cb2 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "test": "mocha -R spec src/**/*.spec.js" }, "dependencies": { + "ansi-colors": "^1.0.1", "escape-string-regexp": "^1.0.5", "event-stream": "^3.1.0", "fancy-log": "^1.3.2", From 5b8a2dfd2b34aa44186c0aeff5afa51f7c6c6145 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:23:28 +0100 Subject: [PATCH 07/16] sc mod: index.js - ansi-colors repalcement for gutil.colors --- src/index.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/index.js b/src/index.js index 5e14cac..6806df2 100644 --- a/src/index.js +++ b/src/index.js @@ -3,17 +3,20 @@ //2018-01-02 sc mod: gulp-util deprecation //2018-01-02 sc mod: require plugin-error to replace gutil.PluginError //2018-01-02 sc mod: require fancy-log to replace gutil.log +//2018-01-02 sc mod: require ansi-colors to replace gutil.colors var through = require('through2'); -var gutil = require('gulp-util'); +//var gutil = require('gulp-util'); +var PluginError = require('plugin-error'); +var log = require('fancy-log'); +var colors = require('ansi-colors'); var path = require('path'); var fs = require('fs'); var escapeStringRegexp = require('escape-string-regexp'); -var magenta = gutil.colors.magenta; -var cyan = gutil.colors.cyan; -var red = gutil.colors.red; -var PluginError = require('plugin-error'); -var log = require('fancy-log'); +var magenta = colors.magenta; +var cyan = colors.cyan; +var red = colors.red; + /** * Constants From 979e1bf0a6b5fb3e19f9173d71d31e6f21af2c33 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:24:59 +0100 Subject: [PATCH 08/16] sc mod: package.json - add: dep. vinyl --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a066cb2..7c4ebeb 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,8 @@ "fancy-log": "^1.3.2", "gulp-util": "^3.0.0", "plugin-error": "^0.1.2", - "through2": "^2.0.1" + "through2": "^2.0.1", + "vinyl": "^2.1.0" }, "devDependencies": { "mocha": "~2.0.1", From 999c5107fa898e80e92f1e2bc26d88694e20cb52 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:27:19 +0100 Subject: [PATCH 09/16] sc mod: index.js - vinyl repalcement for gutil.File --- src/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 6806df2..f0fc719 100644 --- a/src/index.js +++ b/src/index.js @@ -4,12 +4,14 @@ //2018-01-02 sc mod: require plugin-error to replace gutil.PluginError //2018-01-02 sc mod: require fancy-log to replace gutil.log //2018-01-02 sc mod: require ansi-colors to replace gutil.colors +//2018-01-02 sc mod: require vinyl to replace gutil.File var through = require('through2'); //var gutil = require('gulp-util'); var PluginError = require('plugin-error'); var log = require('fancy-log'); var colors = require('ansi-colors'); +var vinyl = require('vinyl'); var path = require('path'); var fs = require('fs'); var escapeStringRegexp = require('escape-string-regexp'); @@ -196,7 +198,7 @@ function extractFilePaths(content, targetPath, opt, tagsRegExp) { try { var fileContent = fs.readFileSync(filePath); files.push({ - file: new gutil.File({ + file: new vinyl({ path: filePath, cwd: __dirname, base: path.resolve(__dirname, 'expected', path.dirname(filePath)), From 7e0333877cba0a68742eaeab92fac6f5eb0e61b6 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:49:45 +0100 Subject: [PATCH 10/16] sc mod: index.js - naming of log to fancyLog --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index f0fc719..c9c420a 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,7 @@ var through = require('through2'); //var gutil = require('gulp-util'); var PluginError = require('plugin-error'); -var log = require('fancy-log'); +var fancyLog = require('fancy-log'); var colors = require('ansi-colors'); var vinyl = require('vinyl'); var path = require('path'); @@ -263,7 +263,7 @@ function error(message) { * @param message */ function log(message) { - log(magenta(PLUGIN_NAME), message); + fancyLog(magenta(PLUGIN_NAME), message); } /** From aa32eb18803724cf091c0fc922f758070685e92b Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:53:25 +0100 Subject: [PATCH 11/16] sc mod: index.spec.js - fancy-log to replace gutil.log --- src/index.spec.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/index.spec.js b/src/index.spec.js index 505e3af..d899ebe 100644 --- a/src/index.spec.js +++ b/src/index.spec.js @@ -1,8 +1,13 @@ 'use strict'; +//2018-01-02 sc mod: gulp-util deprecation +//2018-01-02 sc mod: require fancy-log to replace gutil.log +//2018-01-02 sc mod: require vinyl to replace gutil.File + var fs = require('fs'); var injectPartials = require('../.'); -var gutil = require('gulp-util'); +//var gutil = require('gulp-util'); +var fancyLog =require('fancy-log'); var es = require('event-stream'); var should = require('should'); var path = require('path'); @@ -12,15 +17,15 @@ describe('gulp-inject-partials', function(){ var logOutput = []; beforeEach(function () { - log = gutil.log; + log = fancyLog; logOutput = []; - gutil.log = function () { + fancyLog = function () { logOutput.push(arguments); }; }); afterEach(function () { - gutil.log = log; + fancyLog = log; }); it('should inject single partial', function (done){ From 202a411e8dd6d03109420c0f3ff0678ca9086eeb Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 08:55:56 +0100 Subject: [PATCH 12/16] sc mod: index.spec.js - vinyl to replace gutil.File --- src/index.spec.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/index.spec.js b/src/index.spec.js index d899ebe..6c6105e 100644 --- a/src/index.spec.js +++ b/src/index.spec.js @@ -8,6 +8,7 @@ var fs = require('fs'); var injectPartials = require('../.'); //var gutil = require('gulp-util'); var fancyLog =require('fancy-log'); +var vinyl = require('vinyl'); var es = require('event-stream'); var should = require('should'); var path = require('path'); @@ -127,7 +128,7 @@ function src(files, opt) { // get expected file function expectedFile(file) { var filepath = path.resolve(__dirname, 'expected', file); - return new gutil.File({ + return new vinyl({ path: filepath, cwd: __dirname, base: path.resolve(__dirname, 'expected', path.dirname(file)), @@ -138,7 +139,7 @@ function expectedFile(file) { // get fixture function fixture(file, read) { var filepath = path.resolve(__dirname, 'fixtures', file); - return new gutil.File({ + return new vinyl({ path: filepath, cwd: __dirname, base: path.resolve(__dirname, 'fixtures', path.dirname(file)), From 6c49c5499c35dd0ced8e47c4d285dbbfbbd02a26 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 09:04:10 +0100 Subject: [PATCH 13/16] sc mod: index.js - renaming var vinyl to File --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index c9c420a..d0b87b4 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,7 @@ var through = require('through2'); var PluginError = require('plugin-error'); var fancyLog = require('fancy-log'); var colors = require('ansi-colors'); -var vinyl = require('vinyl'); +var File = require('vinyl'); var path = require('path'); var fs = require('fs'); var escapeStringRegexp = require('escape-string-regexp'); @@ -198,7 +198,7 @@ function extractFilePaths(content, targetPath, opt, tagsRegExp) { try { var fileContent = fs.readFileSync(filePath); files.push({ - file: new vinyl({ + file: new File({ path: filePath, cwd: __dirname, base: path.resolve(__dirname, 'expected', path.dirname(filePath)), From d3cd0809d37d3c20ecb41b460adcbf858597a023 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Wed, 3 Jan 2018 09:04:24 +0100 Subject: [PATCH 14/16] sc mod: index.spec.js - renaming var vinyl to File --- src/index.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.spec.js b/src/index.spec.js index 6c6105e..421fc5a 100644 --- a/src/index.spec.js +++ b/src/index.spec.js @@ -8,7 +8,7 @@ var fs = require('fs'); var injectPartials = require('../.'); //var gutil = require('gulp-util'); var fancyLog =require('fancy-log'); -var vinyl = require('vinyl'); +var File = require('vinyl'); var es = require('event-stream'); var should = require('should'); var path = require('path'); @@ -128,7 +128,7 @@ function src(files, opt) { // get expected file function expectedFile(file) { var filepath = path.resolve(__dirname, 'expected', file); - return new vinyl({ + return new File({ path: filepath, cwd: __dirname, base: path.resolve(__dirname, 'expected', path.dirname(file)), @@ -139,7 +139,7 @@ function expectedFile(file) { // get fixture function fixture(file, read) { var filepath = path.resolve(__dirname, 'fixtures', file); - return new vinyl({ + return new File({ path: filepath, cwd: __dirname, base: path.resolve(__dirname, 'fixtures', path.dirname(file)), From 171768eca236de83285dd8530b23aefc43e397c2 Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Thu, 4 Jan 2018 12:31:06 +0100 Subject: [PATCH 15/16] sc mod: package.json - rm devDep. gulp-util --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 7c4ebeb..6a3ea64 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "escape-string-regexp": "^1.0.5", "event-stream": "^3.1.0", "fancy-log": "^1.3.2", - "gulp-util": "^3.0.0", "plugin-error": "^0.1.2", "through2": "^2.0.1", "vinyl": "^2.1.0" From a45ada6e3058ece76b5f007927046bfc64cdbeea Mon Sep 17 00:00:00 2001 From: ScorpioCoding Date: Thu, 4 Jan 2018 14:53:27 +0100 Subject: [PATCH 16/16] FancyLog --- src/index.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.spec.js b/src/index.spec.js index 421fc5a..d842587 100644 --- a/src/index.spec.js +++ b/src/index.spec.js @@ -18,15 +18,15 @@ describe('gulp-inject-partials', function(){ var logOutput = []; beforeEach(function () { - log = fancyLog; + log = fancyLog.log; logOutput = []; - fancyLog = function () { + fancyLog.log = function () { logOutput.push(arguments); }; }); afterEach(function () { - fancyLog = log; + fancyLog.log = log; }); it('should inject single partial', function (done){