fix for overwriting partials #310
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
doowb
requested changes
May 11, 2018
| @@ -171,14 +171,17 @@ function fromStringRenderer(name) { | |||
| options.filename = path; | |||
|
|
|||
| return promisify(cb, function(cb) { | |||
| readPartials(path, options, function(err) { | |||
| readPartials(path, options, function(err, partials) { | |||
| var extend = (requires.extend || (requires.extend = require('util')._extend)); | |||
There was a problem hiding this comment.
I don't think this is necessary, you can just use Object.assign.
There was a problem hiding this comment.
you sure? I wasn't sure which version needs to be supported since only extend is used in this lib
There was a problem hiding this comment.
thanks for pointing that out... I forgot that it was already used in other places.
lib/consolidate.js
Outdated
| } | ||
| var tmpl = cache(options) || cache(options, engine.template(str, null, options)); | ||
| cb(null, tmpl(options).replace(/\n$/, '')); | ||
| const optionsCopy = extend({}, options); |
There was a problem hiding this comment.
I don't think making a copy of options is necessary here since the copy was already made in fromStringRenderer above and already has the new partials object.
lib/consolidate.js
Outdated
| readPartials(path, options, function(err) { | ||
| readPartials(path, options, function(err, partials) { | ||
| var extend = (requires.extend || (requires.extend = require('util')._extend)); | ||
| var optionsCopy = extend({}, options); |
There was a problem hiding this comment.
just a nitpick... instead of optionsCopy, change this to opts.
doowb
approved these changes
May 14, 2018
|
@marek-nogiec thanks for the PR! I'll try to get this published soon. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi, this is related to #302
I took the approach suggested in that issue (returning new
partialsin the cb ofreadPartials) and merging that with copiedoptions.let me know what you think