Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit 4f73f22

Browse files
jacobheundaviddias
authored andcommitted
fix: use defaults-deep instead of deep-extend
1 parent ec98cd8 commit 4f73f22

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
"cid-tool": "~0.1.0",
8989
"cids": "~0.5.3",
9090
"debug": "^3.1.0",
91-
"deep-extend": "~0.6.0",
9291
"electron-webrtc": "~0.3.0",
9392
"err-code": "^1.1.2",
9493
"file-type": "^8.1.0",

src/core/components/pre-start.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const PeerInfo = require('peer-info')
55
const multiaddr = require('multiaddr')
66
const waterfall = require('async/waterfall')
77
const Keychain = require('libp2p-keychain')
8-
const extend = require('deep-extend')
8+
const defaultsDeep = require('@nodeutils/defaults-deep')
99
const NoKeychain = require('./no-keychain')
1010
/*
1111
* Load stuff from Repo into memory
@@ -22,7 +22,7 @@ module.exports = function preStart (self) {
2222
return cb(null, config)
2323
}
2424

25-
extend(config, self._options.config)
25+
config = defaultsDeep(self._options.config, config)
2626

2727
self.config.replace(config, (err) => {
2828
if (err) {

src/core/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const PeerBook = require('peer-book')
1414
const multibase = require('multibase')
1515
const CID = require('cids')
1616
const debug = require('debug')
17-
const extend = require('deep-extend')
17+
const defaultsDeep = require('@nodeutils/defaults-deep')
1818
const EventEmitter = require('events')
1919

2020
const config = require('./config')
@@ -30,7 +30,7 @@ class IPFS extends EventEmitter {
3030
constructor (options) {
3131
super()
3232

33-
this._options = {
33+
const defaults = {
3434
init: true,
3535
start: true,
3636
EXPERIMENTAL: {},
@@ -45,7 +45,7 @@ class IPFS extends EventEmitter {
4545

4646
options = config.validate(options || {})
4747

48-
extend(this._options, options)
48+
this._options = defaultsDeep(options, defaults)
4949

5050
if (options.init === false) {
5151
this._options.init = false

0 commit comments

Comments
 (0)