This repository was archived by the owner on Aug 11, 2022. It is now read-only.
Fixed lockfiles not being added to the "npm version" commit #17742
Conversation
This file contains hidden or 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
zkat
suggested changes
Jul 12, 2017
lib/version.js
Outdated
| ], options) | ||
| } | ||
| }).nodeify(cb) | ||
| } | ||
|
|
||
| function stagePackageFiles (localData, options) { | ||
| return new BB(function (resolve, reject) { |
There was a problem hiding this comment.
You don't need a promise constructor here. Just:
return addLocalFile('package.json', options, false).then(() => {
if (localData.hasShrinkwrap) {
return addLocalFile('npm-shrinkwrap.json', options, false)
} else if (localData.hasPackageLock) {
return addLocalFile('package-lock.json', options, false)
}
})
There was a problem hiding this comment.
I'm doing this right now! Is there a possibility that this could be merged to the 5.3.0 relese today?
There was a problem hiding this comment.
probably! I'll take a look in the AM and see if this patch is ready to merge. 👍
There was a problem hiding this comment.
Thank you very much!
|
Should be ready for release :) |
zkat
approved these changes
Jul 13, 2017
zkat
pushed a commit
that referenced
this pull request
Jul 13, 2017
* Sequential promises instead of concurrent * Fixed style errors * Removed the promise constructor PR-URL: #17742 Credit: @markpeterfejes Reviewed-By: @zkat
Closed
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Hey!
This small PR fixes #17707 by executing the
git addcommands sequentially instead of concurrently, which sometimes causes the aforementioned error.I'm not really sure that this is the prettiest way to implement this, change suggestions are very welcome!
Thank you!