Upgrade to lodash 4.5.0

lib/read-stream.js

@@ -38,7 +38,7 @@ function expectedError(request, error) {
  */
 module.exports = function createReadStream(options) {
 
-	options = _.assign({
+	options = _.assignWith({
 		buffer: true,
 		read: true,
 		awsOptions: { },
@@ -53,13 +53,13 @@ module.exports = function createReadStream(options) {
 
 		// Select the appropriate S3 API call based on how the user
 		// wants the data.
-		var request = _.assign({ }, options.awsOptions, object);
+		var request = _.assignWith({ }, options.awsOptions, object);
 
 		function resolve(err, result) {
 			if (err) {
 				return callback(!expectedError(request, err) ? err : null);
 			} else {
-				return callback(null, _.assign({ }, object, result));
+				return callback(null, _.assignWith({ }, object, result));
 			}
 		}
 
@@ -68,7 +68,7 @@ module.exports = function createReadStream(options) {
 		} else if (options.read && !options.buffer) {
 			S3S.ReadStream(options.s3, request)
 				.on('open', function open(headers) {
-					resolve(null, _.assign(headers, { Body: this }));
+					resolve(null, _.assignWith(headers, { Body: this }));
 				})
 				.on('error', resolve)
 				.read(0); // Trigger initial read for open event

lib/s3.js

@@ -19,7 +19,6 @@ function S3(options) {
 	this.options = options;
 }
 
-
 /**
  * Fetch vinyl objects from S3 matching a specific set of glob patterns.
  * This method behaves in much the same way as `gulp.src` does.
@@ -31,7 +30,7 @@ function S3(options) {
  * @see gulp.src
  */
 S3.src = function src(path, options) {
-	options = _.assign({ format: 'query' }, options);
+	options = _.assignWith({ format: 'query' }, options);
 	return S3G(path, options)
 		.pipe(readStream(options))
 		.pipe(vinylStream(options));
@@ -53,11 +52,11 @@ S3.dest = function dest(path, options) {
 
 
 S3.prototype.src = function wrapSrc(path, options) {
-	return S3.src(path, _.assign({ }, this.options, options));
+	return S3.src(path, _.assignWith({ }, this.options, options));
 };
 
 S3.prototype.dest = function wrapDest(path, options) {
-	return S3.dest(path, _.assign({ }, this.options, options));
+	return S3.dest(path, _.assignWith({ }, this.options, options));
 };
 
 module.exports = S3;

lib/vinyl-stream.js

@@ -15,7 +15,7 @@ var _ = require('lodash'),
  */
 module.exports = function createVinylStream(options) {
 
-	options = _.assign({
+	options = _.assignWith({
 		meta: true,
 		base: '',
 		cwd: process.cwd()

lib/write-stream.js

@@ -1,4 +1,3 @@
-
 'use strict';
 
 var _ = require('lodash'),
@@ -31,7 +30,7 @@ var encodings = {
  */
 module.exports = function createWriteStream(root, options) {
 
-	options = _.assign({
+	options = _.assignWith({
 		s3: new AWS.S3(),
 		awsOptions: { }
 	}, options);
@@ -44,7 +43,7 @@ module.exports = function createWriteStream(root, options) {
 		throw new TypeError();
 	}
 
-	_.assign(awsOptions, _.isString(root) ? url.urlToOptions(root) : root);
+	_.assignWith(awsOptions, _.isString(root) ? url.urlToOptions(root) : root);
 
 	if (!_.has(awsOptions, 'Bucket')) {
 		throw new TypeError();
@@ -81,7 +80,7 @@ module.exports = function createWriteStream(root, options) {
 		if (contentEncoding.length > 0 && !contentType) {
 			var last = _.chain(name.split('.'))
 				.dropRightWhile(function checkPart(ext) {
-					return _.contains(contentEncoding, encodings[ext]);
+					return _.includes(contentEncoding, encodings[ext]);
 				})
 				.last()
 				.value();
@@ -94,7 +93,7 @@ module.exports = function createWriteStream(root, options) {
 			contentType = mime.lookup(name);
 		}
 
-		var fileOptions = _.assign({ }, awsOptions, {
+		var fileOptions = _.assignWith({ }, awsOptions, {
 			Key: prefix + file.relative,
 			ContentType: contentType,
 			ContentEncoding: contentEncoding.join(',')
@@ -103,7 +102,7 @@ module.exports = function createWriteStream(root, options) {
 		if (!file.isNull()) {
 			// Use the new S3 streaming upload API; for more info see
 			// https://github.com/aws/aws-sdk-js/pull/427
-			s3.upload(_.assign(fileOptions, {
+			s3.upload(_.assignWith(fileOptions, {
 				Body: file.contents
 			}), _.pick(options, 'queueSize', 'partSize'), done);
 		} else {

package.json

@@ -19,7 +19,7 @@
 	},
 	"dependencies": {
 		"aws-sdk": "^2.1.23",
-		"lodash": "^3.9.3",
+		"lodash": "^4.5.0",
 		"mime": "^1.3.4",
 		"vinyl": "^0.5.0",
 		"through2": "^2.0.0",