Skip to content

Commit

Permalink
Merge pull request #44 from TheDancingCode/replace-gutil
Browse files Browse the repository at this point in the history 
Replace deprecated gulp-util
  • Loading branch information
@alvinlin123
alvinlin123 authored May 24, 2018
2 parents 014acf4 + 64d0190 commit 6fb2a7a
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 46 deletions.
12 changes: 6 additions & 6 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ var isUndefined = require("lodash.isundefined");
var through = require('through2');
var path = require('path');
var bless = require('bless');
var gutil = require('gulp-util');
var PluginError = require('plugin-error');
var Vinyl = require('vinyl');
var fancyLog = require('fancy-log');
var merge = require('merge');
var applySourcemap = require('vinyl-sourcemaps-apply');

var Concat = require('concat-with-sourcemaps');

var File = gutil.File;
var PluginError = gutil.PluginError;
var createSuffixFunctionFromString = function(configValue) {
var actualSuffix = configValue === undefined? "-blessed" : configValue;
return function(index) {
Expand Down Expand Up @@ -71,7 +71,7 @@ module.exports = function(options){
} else {
msg += ', not splitting.';
}
gutil.log(msg);
fancyLog.info(msg);
}

var addSourcemap = function(fileToAddTo, blessOutputIndex) {
Expand All @@ -93,7 +93,7 @@ module.exports = function(options){

// get out early if the file isn't long enough
if(result.data.length === 1){
return cb(null, addSourcemap(new File({
return cb(null, addSourcemap(new Vinyl({
cwd: file.cwd,
base: file.base,
path: outputFilePath,
Expand Down Expand Up @@ -137,7 +137,7 @@ module.exports = function(options){
? outputFilePath
: path.resolve(path.join(outputPathStart, createBlessedFileName(oneBasedIndex)));

var outFile = addSourcemap(new File({
var outFile = addSourcemap(new Vinyl({
cwd: file.cwd,
base: file.base,
path: outputPath,
Expand Down
4 changes: 3 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
"dependencies": {
"bless": "^4.0.0",
"concat-with-sourcemaps": "^1.0.4",
"gulp-util": "*",
"fancy-log": "^1.3.2",
"lodash.isfunction": "^3.0.8",
"lodash.isstring": "^4.0.1",
"lodash.isundefined": "^3.0.1",
"merge": "~1.2.0",
"plugin-error": "^1.0.1",
"through2": "~0.5.1",
"vinyl": "^2.1.0",
"vinyl-sourcemaps-apply": "^0.2.1"
},
"devDependencies": {
Expand Down
78 changes: 39 additions & 39 deletions test/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var cleanCss = require('gulp-clean-css');
var should = require('should');
var fs = require('fs');
var path = require('path');
var File = require('gulp-util').File;
var Vinyl = require('vinyl');
var Buffer = require('buffer').Buffer;
var assert = require('stream-assert');
var gulp = require('gulp');
Expand Down Expand Up @@ -40,7 +40,7 @@ describe('gulp-bless', function() {
done();
});

stream.write(new File({
stream.write(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/file.css",
Expand All @@ -65,7 +65,7 @@ describe('gulp-bless', function() {
done();
});

stream.write(new File({
stream.write(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/empty.css",
Expand All @@ -81,7 +81,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long.css', function(err, data){
if(err) throw new Error(err);

var longStylesheet = new File({
var longStylesheet = new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split.css",
Expand All @@ -92,7 +92,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long-split.css', function(err, data){
if(err) throw new Error(err);

expectedSplits.push(new File({
expectedSplits.push(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split.css",
Expand All @@ -102,7 +102,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long-split-blessed1.css', function(err, data){
if(err) throw new Error(err);

expectedSplits.push(new File({
expectedSplits.push(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split-blessed1.css",
Expand Down Expand Up @@ -152,7 +152,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long.css', function(err, data){
if(err) throw new Error(err);

var longStylesheet = new File({
var longStylesheet = new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split.css",
Expand Down Expand Up @@ -202,7 +202,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long.css', function(err, data){
if(err) throw new Error(err);

var longStylesheet = new File({
var longStylesheet = new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split.css",
Expand Down Expand Up @@ -252,13 +252,13 @@ describe('gulp-bless', function() {

it('should apply sourcemaps', function(done){
var expectedSplits = [
new File({
new Vinyl({
cwd: "/home/test/",
base: "/home/test/css",
path: "/home/test/css/long-split.css",
contents: new Buffer(fs.readFileSync('./test/css/long-split.css').toString('utf8'))
}),
new File({
new Vinyl({
cwd: "/home/test/",
base: "/home/test/css",
path: "/home/test/css/long-split-blessed1.css",
Expand Down Expand Up @@ -356,13 +356,13 @@ describe('gulp-bless', function() {
this.timeout(5000); //yea .. this test reads larger data so needs more time

var expectedSplits = [
new File({
new Vinyl({
cwd: "/home/test/",
base: "/home/test/css",
path: "/home/test/css/long-split.css",
contents: new Buffer(fs.readFileSync('./test/css/long-split-with-sourcemap-comment.css').toString('utf8'))
}),
new File({
new Vinyl({
cwd: "/home/test/",
base: "/home/test/css",
path: "/home/test/css/long-split-blessed1.css",
Expand Down Expand Up @@ -452,7 +452,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long.css', function(err, data){
if(err) throw new Error(err);

var longStylesheet = new File({
var longStylesheet = new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split.css",
Expand All @@ -463,7 +463,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long-split--no-cache-buster.css', function(err, data){
if(err) throw new Error(err);

expectedSplits.push(new File({
expectedSplits.push(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split.css",
Expand All @@ -473,7 +473,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long-split-blessed1.css', function(err, data){
if(err) throw new Error(err);

expectedSplits.push(new File({
expectedSplits.push(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split-blessed1.css",
Expand Down Expand Up @@ -522,7 +522,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long.css', function(err, data){
if(err) throw new Error(err);

var longStylesheet = new File({
var longStylesheet = new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split.css",
Expand All @@ -533,7 +533,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long-split--no-imports.css', function(err, data){
if(err) throw new Error(err);

expectedSplits.push(new File({
expectedSplits.push(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split.css",
Expand All @@ -543,7 +543,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long-split-blessed1.css', function(err, data){
if(err) throw new Error(err);

expectedSplits.push(new File({
expectedSplits.push(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/long-split-blessed1.css",
Expand Down Expand Up @@ -587,14 +587,14 @@ describe('gulp-bless', function() {
it('should return empty file if empty files are passed', function(done){
var stream = bless();

var stylesheetA = new File({
var stylesheetA = new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/file.css",
contents: new Buffer("")
});

var stylesheetB = new File({
var stylesheetB = new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/file.css",
Expand Down Expand Up @@ -635,7 +635,7 @@ describe('gulp-bless', function() {
done();
});

stream.write(new File({
stream.write(new Vinyl({
path: 'a',
base: 'a',
cwd: 'a',
Expand All @@ -660,7 +660,7 @@ describe('gulp-bless', function() {
done();
});

stream.write(new File({
stream.write(new Vinyl({
path: 'style.css',
contents: new Buffer('p {color:red;}')
}));
Expand Down Expand Up @@ -690,7 +690,7 @@ describe('gulp-bless', function() {
done();
});

stream.write(new File({
stream.write(new Vinyl({
base: '/test/',
cwd: '/test/a/',
path: '/test/a/style.xml',
Expand Down Expand Up @@ -722,7 +722,7 @@ describe('gulp-bless', function() {
done();
});

stream.write(new File({
stream.write(new Vinyl({
base: '/test/',
cwd: '/test/a/',
path: '/test/a/style',
Expand All @@ -737,14 +737,14 @@ describe('gulp-bless', function() {
var numberOfFiles = 0;
var numberOfErrrors = 0;

var fileA = new File({
var fileA = new Vinyl({
base: '/test/',
cwd: '/test/a/',
path: '/test/a/abc.css',
contents: new Buffer('p {\n color: red;\n}')
});

var fileB = new File({
var fileB = new Vinyl({
base: '/test/',
cwd: '/test/a/',
path: '/test/a/def.css',
Expand Down Expand Up @@ -779,10 +779,10 @@ describe('gulp-bless', function() {
});


it("should log using gulp-util when option is enabled", function(done){
it("should log using fancy-log when option is enabled", function(done){
var gulpBless = mockrequire('../index', {
'gulp-util': {
log: function(text){
'fancy-log': {
info: function(text){
text.should.equal('Found 1 selector, not splitting.');
done();
}
Expand All @@ -793,7 +793,7 @@ describe('gulp-bless', function() {
log: true
});

stream.write(new File({
stream.write(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/file.css",
Expand All @@ -805,8 +805,8 @@ describe('gulp-bless', function() {

it("should log file splitted for large css", function(done){
var gulpBless = mockrequire('../index', {
'gulp-util': {
log: function(text){
'fancy-log': {
info: function(text){
text.should.equal('Found 4096 selectors, splitting into 2 blessedFiles.');
done();
}
Expand All @@ -819,7 +819,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/long.css', function(err, data){
if(err) throw new Error(err);

stream.write(new File({
stream.write(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/file.css",
Expand All @@ -832,11 +832,11 @@ describe('gulp-bless', function() {



it("should not log using gulp-util when option isn't true", function(done) {
it("should not log using fancy-log when option isn't true", function(done) {
var gulpBless = mockrequire('../index', {
'gulp-util': {
log: function (text) {
should.fail(null, null, "gulp-util.log shouldn't have been called");
'fancy-log': {
info: function (text) {
should.fail(null, null, "fancy-log shouldn't have been called");
}
}
});
Expand All @@ -848,7 +848,7 @@ describe('gulp-bless', function() {
done();
});

stream.write(new File({
stream.write(new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/file.css",
Expand All @@ -864,7 +864,7 @@ describe('gulp-bless', function() {
fs.readFile('./test/css/issue-25-test.css', function(err, data){
if(err) throw new Error(err);

var longStylesheet = new File({
var longStylesheet = new Vinyl({
cwd: "/home/adam/",
base: "/home/adam/test",
path: "/home/adam/test/issue-25-test.css",
Expand Down

0 comments on commit 6fb2a7a

Please sign in to comment.