Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: drop lodash.merge #3880

Merged
merged 3 commits into from
Dec 10, 2019
Merged

refactor: drop lodash.merge #3880

merged 3 commits into from
Dec 10, 2019

Conversation

SukkaW
Copy link
Member

@SukkaW SukkaW commented Nov 21, 2019 •
edited
Loading

What does it do?

#3753

This is only a PoC of lodash.merge replacement. If this PR doesn't have huge performance impact, we should bring up a deepMerge() in hexo-util.

How to test

git clone -b drop-lodash-for-config https://github.com/sukkaw/hexo.git
cd hexo
npm install
npm test

Screenshots

Pull request tasks

  • Add test cases for the changes.
  • Passed the CI test.

@SukkaW SukkaW requested a review from curbengh November 21, 2019 23:42
@coveralls
Copy link

coveralls commented Nov 21, 2019 •
edited
Loading

Coverage Status

Coverage increased (+0.0008%) to 97.131% when pulling a6c6b84 on SukkaW:drop-lodash-for-config into 140ed36 on hexojs:master.

@SukkaW SukkaW mentioned this pull request Nov 22, 2019
Merged
@SukkaW SukkaW changed the title test: replace lodash.merge with ES6 test: drop lodash.merge Nov 25, 2019
@SukkaW
Copy link
Member Author

SukkaW commented Dec 1, 2019

With hexojs/hexo-util#141 we could replace all lodash.merge with hexo-util.deepMerge.

@curbengh
Copy link
Contributor

curbengh commented Dec 7, 2019

hexojs/hexo-util#141 has been merged, not released yet. Can this PR uses master branch of hexo-util temporarily for testing? Once that PR is released, simply update the hexo-util dep.

curbengh
curbengh reviewed Dec 10, 2019
View reviewed changes
package.json Outdated Show resolved Hide resolved
curbengh
curbengh reviewed Dec 10, 2019
View reviewed changes
package.json Outdated Show resolved Hide resolved
@SukkaW SukkaW force-pushed the drop-lodash-for-config branch from 5b38c4f to a6c6b84 Compare December 10, 2019 12:35
@SukkaW SukkaW requested a review from curbengh December 10, 2019 12:37
@SukkaW SukkaW changed the title test: drop lodash.merge refactor: drop lodash.merge Dec 10, 2019
@curbengh
Copy link
Contributor

The soft fail is addressed in #3924

@SukkaW SukkaW merged commit c15ce89 into hexojs:master Dec 10, 2019
@SukkaW SukkaW mentioned this pull request Dec 12, 2019
Merged
1 task
thom4parisot pushed a commit to thom4parisot/hexo that referenced this pull request Jan 17, 2020
@SukkaW
refactor: drop lodash.merge (hexojs#3880)
ccbc380 
* refactor: replace lodash.merge with ES6

* refactor: replace lodash.merge with deepmerge

* refactor: utilize hexo-util
@snyk-bot snyk-bot mentioned this pull request Mar 16, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@curbengh curbengh curbengh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SukkaW @coveralls @curbengh