Merge f5f3421 into 4a386de

frankthelen · Oct 15, 2018 · 850c08b · 850c08b
2 parents 4a386de + f5f3421
commit 850c08b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,11 @@
   "dependencies": {
     "arrify": "^1.0.1",
     "bluebird": "^3.5.1",
-    "lodash": "^4.17.10",
+    "lodash.intersection": "^4.4.0",
+    "lodash.isboolean": "^3.0.3",
+    "lodash.isfunction": "^3.0.9",
+    "lodash.isinteger": "^4.0.4",
+    "lodash.isstring": "^4.0.1",
     "md5": "^2.2.1",
     "uniqueid": "^1.0.0"
   }

diff --git a/src/ConflictResolution.js b/src/ConflictResolution.js
@@ -1,4 +1,4 @@
-const intersection = require('lodash/intersection');
+const intersection = require('lodash.intersection');
 
 class ConflictResolution {
   constructor({ strategy = 'ps', logger }) {

diff --git a/src/Rule.js b/src/Rule.js
@@ -1,7 +1,7 @@
-const isBoolean = require('lodash/isBoolean');
-const isFunction = require('lodash/isFunction');
-const isInteger = require('lodash/isInteger');
-const isString = require('lodash/isString');
+const isBoolean = require('lodash.isboolean');
+const isFunction = require('lodash.isfunction');
+const isInteger = require('lodash.isinteger');
+const isString = require('lodash.isstring');
 const assert = require('assert');
 const arrify = require('arrify');