Skip to content
This repository has been archived by the owner on Jun 15, 2023. It is now read-only.

Fix out of date npms #21

Merged
merged 3 commits into from
Jun 29, 2018
Merged

Fix out of date npms #21

merged 3 commits into from
Jun 29, 2018

Conversation

camelmasa
Copy link
Contributor

@camelmasa camelmasa commented Apr 21, 2018

I updated deepmerge and libp2p-crypto npms for dependencies out of date.
Also, I added .aegir.js file for fixing deepmerge's issue. TehShrike/deepmerge#87

We can choice to wait until fix the issue. Thought ?

.aegir.js Outdated
webpack: {
resolve: {
alias: {
deepmerge$: path.resolve(__dirname, 'node_modules/deepmerge/dist/umd.js')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need deepmerge, can we replace it with lodash merge or defaultsDeep?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for comment. Maybe we can replace deepmerge (Or, Object.assign() ?) . I'll investigate that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Object.assign does NOT do a deep merge.

Copy link
Contributor Author

@camelmasa camelmasa Apr 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to replace deepmerge to lodash.merge. It works and passed tests.
https://github.com/camelmasa/js-libp2p-keychain/commit/093711e21090e938e4f5fc50d12d1867c17e05fa

Should we replace the npm from deepmerge to lodash.merge ? If that is okay, I'll rebase commits in this PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@camelmasa
Copy link
Contributor Author

I rebased commits. If it looks good, Please merge it 😃

Copy link
Member

@dryajov dryajov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@daviddias daviddias merged commit 0065b0a into libp2p:master Jun 29, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants