m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Replace deep-extend with merge from lodash (#7908)

Browse Source 
The `merge` function from `deep-extend` is at least mostly equivalent
to `merge` from `lodash` - certainly in how we're using it.
This commit is contained in:
Mark Stacey 2020-01-27 14:01:09 -04:00 committed by GitHub
parent 491675d50e
commit f2a719a70c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/migrations/009.js
View File

@ -6,7 +6,7 @@ This migration breaks out the CurrencyController substate
*/
import merge from 'deep-extend'
import { merge } from 'lodash'
import clone from 'clone'

2
app/scripts/migrations/010.js
View File

@ -6,7 +6,7 @@ This migration breaks out the ShapeShiftController substate
*/
import merge from 'deep-extend'
import { merge } from 'lodash'
import clone from 'clone'

1
package.json
View File

@ -87,7 +87,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",

2
yarn.lock
View File

@ -8734,7 +8734,7 @@ deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@~1.0.1:
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
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==