|
 |
8b602a4 |
From eb00aa591172c473835ff73285680e7422956257 Mon Sep 17 00:00:00 2001
|
|
|
8b602a4 |
From: Anton Harniakou <anton.harniakou@gmail.com>
|
|
|
8b602a4 |
Date: Wed, 25 Nov 2015 18:25:17 +0300
|
|
|
8b602a4 |
Subject: [PATCH] Use lodash v3
|
|
|
8b602a4 |
|
|
|
8b602a4 |
There are some breaking changes in lodash v3,
|
|
|
8b602a4 |
such as flatten has become shallow.
|
|
|
8b602a4 |
This commit takes that into account and replaces _.flatten with
|
|
|
8b602a4 |
_.flattenDeep.
|
|
|
8b602a4 |
---
|
|
|
8b602a4 |
lib/globule.js | 8 ++++----
|
|
|
8b602a4 |
package.json | 2 +-
|
|
|
8b602a4 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
8b602a4 |
|
|
|
8b602a4 |
diff --git a/lib/globule.js b/lib/globule.js
|
|
|
8b602a4 |
index 5a3eeac..7c6328e 100644
|
|
|
8b602a4 |
--- a/lib/globule.js
|
|
|
8b602a4 |
+++ b/lib/globule.js
|
|
|
8b602a4 |
@@ -46,8 +46,8 @@ globule.match = function(patterns, filepaths, options) {
|
|
|
8b602a4 |
// Return empty set if either patterns or filepaths was omitted.
|
|
|
8b602a4 |
if (patterns == null || filepaths == null) { return []; }
|
|
|
8b602a4 |
// Normalize patterns and filepaths to flattened arrays.
|
|
|
8b602a4 |
- patterns = _.isArray(patterns) ? _.flatten(patterns) : [patterns];
|
|
|
8b602a4 |
- filepaths = _.isArray(filepaths) ? _.flatten(filepaths) : [filepaths];
|
|
|
8b602a4 |
+ patterns = _.isArray(patterns) ? _.flattenDeep(patterns) : [patterns];
|
|
|
8b602a4 |
+ filepaths = _.isArray(filepaths) ? _.flattenDeep(filepaths) : [filepaths];
|
|
|
8b602a4 |
// Return empty set if there are no patterns or filepaths.
|
|
|
8b602a4 |
if (patterns.length === 0 || filepaths.length === 0) { return []; }
|
|
|
8b602a4 |
// Return all matching filepaths.
|
|
|
8b602a4 |
@@ -71,9 +71,9 @@ globule.find = function() {
|
|
|
8b602a4 |
// arguments. Flatten nested arrays.
|
|
|
8b602a4 |
var patterns;
|
|
|
8b602a4 |
if (options.src) {
|
|
|
8b602a4 |
- patterns = _.isArray(options.src) ? _.flatten(options.src) : [options.src];
|
|
|
8b602a4 |
+ patterns = _.isArray(options.src) ? _.flattenDeep(options.src) : [options.src];
|
|
|
8b602a4 |
} else {
|
|
|
8b602a4 |
- patterns = _.flatten(args);
|
|
|
8b602a4 |
+ patterns = _.flattenDeep(args);
|
|
|
8b602a4 |
}
|
|
|
8b602a4 |
// Return empty set if there are no patterns.
|
|
|
8b602a4 |
if (patterns.length === 0) { return []; }
|
|
|
8b602a4 |
diff --git a/package.json b/package.json
|
|
|
8b602a4 |
index e040dc3..cfdfb57 100644
|
|
|
8b602a4 |
--- a/package.json
|
|
|
8b602a4 |
+++ b/package.json
|
|
|
8b602a4 |
@@ -45,7 +45,7 @@
|
|
|
8b602a4 |
"awesome"
|
|
|
8b602a4 |
],
|
|
|
8b602a4 |
"dependencies": {
|
|
|
8b602a4 |
- "lodash": "~2.4.1",
|
|
|
8b602a4 |
+ "lodash": "~3.10.1",
|
|
|
8b602a4 |
"glob": "~3.2.7",
|
|
|
8b602a4 |
"minimatch": "~0.2.11"
|
|
|
8b602a4 |
}
|