Update: Use lodash.defaultto instead of our custom method

lib/prepare-write.js

@@ -3,10 +3,10 @@
 var assign = require('object-assign');
 var path = require('path');
 var fs = require('graceful-fs');
-var fo = require('./file-operations');
-
 var valueOrFunction = require('value-or-function');
-var defaultValue = require('./default-value');
+var defaultTo = require('lodash.defaultto');
+
+var fo = require('./file-operations');
 
 var boolean = valueOrFunction.boolean;
 var number = valueOrFunction.number;
@@ -19,10 +19,10 @@ function prepareWrite(outFolder, file, opt, callback) {
 
   var defaultMode = file.stat ? file.stat.mode : null;
   var options = assign({}, opt, {
-    cwd: defaultValue(process.cwd(), string(opt.cwd, file)),
-    mode: defaultValue(defaultMode, number(opt.mode, file)),
+    cwd: defaultTo(string(opt.cwd, file), process.cwd()),
+    mode: defaultTo(number(opt.mode, file), defaultMode),
     dirMode: number(opt.dirMode, file),
-    overwrite: defaultValue(true, boolean(opt.overwrite, file)),
+    overwrite: defaultTo(boolean(opt.overwrite, file), true),
   });
   options.flag = (options.overwrite ? 'w' : 'wx');
 

lib/src/index.js

@@ -8,8 +8,8 @@ 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 defaultValue = require('../default-value');
 var filterSince = require('../filter-since');
 var getContents = require('./get-contents');
 var wrapWithVinylFile = require('./wrap-with-vinyl-file');
@@ -23,13 +23,13 @@ function src(glob, opt) {
   }
 
   var options = assign({}, opt, {
-    buffer: defaultValue(true, boolean(opt.buffer)),
-    read: defaultValue(true, boolean(opt.read)),
+    buffer: defaultTo(boolean(opt.buffer), true),
+    read: defaultTo(boolean(opt.read), true),
     since: date(opt.since),
-    stripBOM: defaultValue(true, boolean(opt.stripBOM)),
-    sourcemaps: defaultValue(false, boolean(opt.sourcemaps)),
-    passthrough: defaultValue(false, boolean(opt.passthrough)),
-    followSymlinks: defaultValue(true, boolean(opt.followSymlinks)),
+    stripBOM: defaultTo(boolean(opt.stripBOM), true),
+    sourcemaps: defaultTo(boolean(opt.sourcemaps), false),
+    passthrough: defaultTo(boolean(opt.passthrough), false),
+    followSymlinks: defaultTo(boolean(opt.followSymlinks), true),
   });
 
   // Don't pass `read` option on to through2

lib/symlink/index.js

@@ -5,10 +5,10 @@ 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 sink = require('../sink');
 var prepareWrite = require('../prepare-write');
-var defaultValue = require('../default-value');
 
 var boolean = valueOrFunction.boolean;
 
@@ -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 = defaultValue(false, boolean(opt.relative, file));
+    var isRelative = defaultTo(boolean(opt.relative, file), false);
 
     prepareWrite(outFolder, file, opt, onPrepare);
 

package.json

@@ -33,6 +33,7 @@
     "gulp-sourcemaps": "^1.5.2",
     "is-valid-glob": "^0.3.0",
     "lazystream": "^1.0.0",
+    "lodash.defaultto": "^4.14.0",
     "merge-stream": "^1.0.0",
     "object-assign": "^4.0.0",
     "strip-bom": "^2.0.0",