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.

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

allow merging of configs #107

Merged
merged 2 commits into from
May 7, 2019
Merged

allow merging of configs #107

merged 2 commits into from
May 7, 2019

Conversation

trieloff
Copy link
Contributor

@trieloff trieloff commented May 7, 2019

required for adobe/helix-cli#821

@codecov
Copy link

codecov bot commented May 7, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@48528e4). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #107   +/-   ##
=========================================
  Coverage          ?   98.88%           
=========================================
  Files             ?       18           
  Lines             ?     1341           
  Branches          ?      282           
=========================================
  Hits              ?     1326           
  Misses            ?       15           
  Partials          ?        0
Impacted Files Coverage Δ
src/HelixConfig.js 90.9% <100%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 48528e4...31d2a42. Read the comment docs.

@trieloff trieloff requested a review from koraa May 7, 2019 12:23
@trieloff trieloff merged commit 01b2ac9 into master May 7, 2019
@adobe-bot
Copy link

🎉 This PR is included in version 1.2.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@tripodsan tripodsan deleted the config-merging branch May 7, 2019 23:47
* object and a user-defined resolver function.
* @param {HelixConfig} other another Helix Config to merge
* @param {ResolveFn} resolvefn a resolver function that returns either a strain or undefined
* @returns {HelixConfig} the merged Helix Config
Copy link
Contributor

Choose a reason for hiding this comment

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

@trieloff I would return a new config and leave the original untouched. or at least clarify that your are returning this.

trieloff added a commit that referenced this pull request May 8, 2019
@adobe-bot
Copy link

🎉 This issue has been resolved in version 1.3.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants