Merge branch 'master' into feat/dash

JPeer264 · Apr 27, 2018 · 90c97ec · 90c97ec
2 parents 42a714b + 57ed1a1
commit 90c97ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/lib/keyframesLibrary.js b/lib/keyframesLibrary.js
@@ -1,4 +1,4 @@
-import { merge } from 'lodash';
+import merge from 'lodash.merge';
 import includes from 'array-includes';
 
 import replace from './replace';

diff --git a/lib/selectorLibrary.js b/lib/selectorLibrary.js
@@ -1,5 +1,5 @@
 import { parse } from 'postcss';
-import { merge } from 'lodash';
+import merge from 'lodash.merge';
 import includes from 'array-includes';
 import entries from 'object.entries';
 

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "espree": "^3.4.3",
     "fs-extra": "^2.0.0",
     "json-extra": "^0.5.0",
-    "lodash": "^4.17.4",
+    "lodash.merge": "^4.6.1",
     "object.entries": "^1.0.4",
     "postcss": "^6.0.17",
     "recast": "^0.12.5"

diff --git a/yarn.lock b/yarn.lock
@@ -2710,7 +2710,11 @@ lodash.merge@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
-lodash@^4.0.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash.merge@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
+
+lodash@^4.0.0, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"