Skip to content

Commit

Permalink
Replace deep-extend with merge from lodash (MetaMask#7908)
Browse files Browse the repository at this point in the history
The `merge` function from `deep-extend` is at least mostly equivalent
to `merge` from `lodash` - certainly in how we're using it.
  • Loading branch information
Gudahtt authored and yqrashawn committed Feb 10, 2020
1 parent 38798e0 commit 3997db0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/scripts/migrations/009.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This migration breaks out the CurrencyController substate
*/

import merge from 'deep-extend'
import { merge } from 'lodash'

import clone from 'clone'

Expand Down
2 changes: 1 addition & 1 deletion app/scripts/migrations/010.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This migration breaks out the ShapeShiftController substate
*/

import merge from 'deep-extend'
import { merge } from 'lodash'

import clone from 'clone'

Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
"bip39": "^2.2.0",
"bn.js": "^4.11.7",
"browserify-derequire": "^0.9.4",
"cfx-fc-abi": "^1.0.0",
"c3": "^0.7.10",
"cfx-fc-abi": "^1.0.0",
"classnames": "^2.2.6",
"clone": "^2.1.2",
"content-hash": "^2.5.0",
Expand All @@ -107,7 +107,6 @@
"d3": "^5.15.0",
"debounce": "1.1.0",
"debounce-stream": "^2.0.0",
"deep-extend": "^0.5.1",
"deep-freeze-strict": "1.1.1",
"detect-node": "^2.0.3",
"dnode": "^1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9116,7 +9116,7 @@ deep-equal@^1.1.0:
object-keys "^1.1.1"
regexp.prototype.flags "^1.2.0"

deep-extend@^0.5.0, deep-extend@^0.5.1:
deep-extend@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
integrity sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==
Expand Down

0 comments on commit 3997db0

Please sign in to comment.