From 031fdee00c3de7f986d5dc1fc34095b5c282abfc Mon Sep 17 00:00:00 2001 From: Ricardo Pierre-Louis Date: Sat, 25 Feb 2017 12:25:35 -0600 Subject: [PATCH] Update: Replace lodash.defaultto with koalas (closes #220) (#221) --- lib/prepare-write.js | 8 ++++---- lib/src/index.js | 14 +++++++------- lib/symlink/index.js | 4 ++-- package.json | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/prepare-write.js b/lib/prepare-write.js index 352df2a8..6bf93aa3 100644 --- a/lib/prepare-write.js +++ b/lib/prepare-write.js @@ -4,7 +4,7 @@ var assign = require('object-assign'); var path = require('path'); var fs = require('graceful-fs'); var valueOrFunction = require('value-or-function'); -var defaultTo = require('lodash.defaultto'); +var koalas = require('koalas'); var fo = require('./file-operations'); @@ -19,10 +19,10 @@ function prepareWrite(outFolder, file, opt, callback) { var defaultMode = file.stat ? file.stat.mode : null; var options = assign({}, opt, { - cwd: defaultTo(string(opt.cwd, file), process.cwd()), - mode: defaultTo(number(opt.mode, file), defaultMode), + cwd: koalas(string(opt.cwd, file), process.cwd()), + mode: koalas(number(opt.mode, file), defaultMode), dirMode: number(opt.dirMode, file), - overwrite: defaultTo(boolean(opt.overwrite, file), true), + overwrite: koalas(boolean(opt.overwrite, file), true), }); options.flag = (options.overwrite ? 'w' : 'wx'); diff --git a/lib/src/index.js b/lib/src/index.js index 95fb9716..b3b6ef93 100644 --- a/lib/src/index.js +++ b/lib/src/index.js @@ -8,7 +8,7 @@ var merge = require('merge-stream'); var sourcemaps = require('gulp-sourcemaps'); var isValidGlob = require('is-valid-glob'); var valueOrFunction = require('value-or-function'); -var defaultTo = require('lodash.defaultto'); +var koalas = require('koalas'); var filterSince = require('../filter-since'); var getContents = require('./get-contents'); @@ -23,13 +23,13 @@ function src(glob, opt) { } var options = assign({}, opt, { - buffer: defaultTo(boolean(opt.buffer), true), - read: defaultTo(boolean(opt.read), true), + buffer: koalas(boolean(opt.buffer), true), + read: koalas(boolean(opt.read), true), since: date(opt.since), - stripBOM: defaultTo(boolean(opt.stripBOM), true), - sourcemaps: defaultTo(boolean(opt.sourcemaps), false), - passthrough: defaultTo(boolean(opt.passthrough), false), - followSymlinks: defaultTo(boolean(opt.followSymlinks), true), + stripBOM: koalas(boolean(opt.stripBOM), true), + sourcemaps: koalas(boolean(opt.sourcemaps), false), + passthrough: koalas(boolean(opt.passthrough), false), + followSymlinks: koalas(boolean(opt.followSymlinks), true), }); // Don't pass `read` option on to through2 diff --git a/lib/symlink/index.js b/lib/symlink/index.js index 34e3485b..9b452a69 100644 --- a/lib/symlink/index.js +++ b/lib/symlink/index.js @@ -5,7 +5,7 @@ var path = require('path'); var fs = require('graceful-fs'); var through2 = require('through2'); var valueOrFunction = require('value-or-function'); -var defaultTo = require('lodash.defaultto'); +var koalas = require('koalas'); var sink = require('../sink'); var prepareWrite = require('../prepare-write'); @@ -20,7 +20,7 @@ function symlink(outFolder, opt) { function linkFile(file, enc, callback) { var srcPath = file.path; var symType = (file.isDirectory() ? 'dir' : 'file'); - var isRelative = defaultTo(boolean(opt.relative, file), false); + var isRelative = koalas(boolean(opt.relative, file), false); prepareWrite(outFolder, file, opt, onPrepare); diff --git a/package.json b/package.json index 97a11ca2..ad7a4723 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "graceful-fs": "^4.0.0", "gulp-sourcemaps": "^1.5.2", "is-valid-glob": "^0.3.0", + "koalas": "^1.0.1", "lazystream": "^1.0.0", - "lodash.defaultto": "^4.14.0", "merge-stream": "^1.0.0", "object-assign": "^4.0.0", "strip-bom": "^2.0.0",