Update patch-package (fix remaining source of seemingly random ENOENT error) #1739
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
pdcastro
force-pushed
the
1723-update-patch-package
branch
2 times, most recently
from
a4c244b to
de7ee4f
Compare
pdcastro
commented
Apr 20, 2020
There was a problem hiding this comment.
The renaming of some patch files from .patch to .dev.patch is explained at:
https://www.npmjs.com/package/patch-package#dev-only-patches
| + 'package.json', | ||
| + 'patches', | ||
| + 'patches0', | ||
| + 'typings', |
There was a problem hiding this comment.
The modifications to this patch file (@oclif+dev-cli+1.22.0.patch) are:
- Reformatted the
sourcesarray entries in alphabetical order, with one entry per line. - Added folder
patches0to thesourcesarray entries. This is a new folder being added to the CLI repo in this PR. (See other comment.) - Recreated the patch file in the usual way, in order to update the commit hashes and line numbers:
npx patch-package \@oclif/dev-cli
- Renamed the patch file to
.dev.patch(as required by the new version of patch-package, to avoid warnings/errors).
| }, | ||
| "scripts": { | ||
| "postinstall": "patch-package", | ||
| "postinstall": "patch-package --patch-dir patches0 && patch-package", |
There was a problem hiding this comment.
As suggested in ds300/patch-package#203 (comment)
| // yay patch was applied successfully | ||
| // print warning if version mismatch | ||
| - if (installedPackageVersion !== version) { | ||
| + if (installedPackageVersion !== version.replace(/\.dev$/, "")) { |
There was a problem hiding this comment.
- This patch "solves" issue Mismatched version warning for identical versions (.patch vs .dev.patch) ds300/patch-package#201 and replicates upstream PR Ignore ".dev" suffix when deciding on package version mismatch ds300/patch-package#224
- It was added to a new separate folder
'patches0'instead of the existing usual'patches'folder so thatpatch-packagecan patch itself before being used to apply other patches (patch-package should support patching itself inpostinstallscript ds300/patch-package#203 (comment)). The zero at the end ofpatches0was meant to convey the idea that it comes first, at the very beginning, liket0in physics...
|
@balena-ci retest |
pdcastro
requested review from
CameronDiver,
hedss,
srlowe and
thgreasi
as code owners
CameronDiver
approved these changes
Apr 21, 2020
pdcastro
force-pushed
the
1723-update-patch-package
branch
from
de7ee4f to
3f9dcf2
Compare
|
@balena-ci retest |
… error) Connects-to: #1723 Change-type: patch
pdcastro
force-pushed
the
1723-update-patch-package
branch
from
3f9dcf2 to
e3c42cf
Compare
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.
This PR arranges for
patch-packageto patch itself before applying other patches (as suggested in ds300/patch-package#203 (comment)). This is necessary (desirable) in order to fix the remaining (theoretical) occurrence of "random ENOENT" described in #1723, and also to allowpatch-packageto be updated without facing issue ds300/patch-package/issues/201. As a bonus, a number of old dependencies are are removed from production installations of balena-cli: see diff fornpm-shrinkwrap.json.I tried getting it resolved upstream before putting together this PR, but so far without success:
postinstallscript ds300/patch-package#203Connects-to: #1723
Change-type: patch