-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
fix: GH-935 replaced compare-func with native sort method #937
Conversation
In draft because there is an issue preventing tests from running successfully on NodeJS 12. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Norman, LGTM
Should I wait for #938 before I merge? Not sure what would be acceptable here, given the circumstances... |
You will need to rebase first. |
b60c4dd
to
6c8bfc5
Compare
Codecov Report
@@ Coverage Diff @@
## master #937 +/- ##
==========================================
+ Coverage 65.27% 65.42% +0.15%
==========================================
Files 21 21
Lines 1817 1828 +11
==========================================
+ Hits 1186 1196 +10
- Misses 631 632 +1
Continue to review full report at Codecov.
|
This reverts the fileSorter to the state from before apache#937, but using our own simple re-implementation of `compare-func`.
This reverts the fileSorter to the state from before apache#937, but using our own simple re-implementation of `compare-func`.
This reverts the fileSorter to the state from before apache#937, but using our own simple re-implementation of `compare-func`.
* refactor(ProjectBuilder): less repetitive fileSorter This reverts the fileSorter to the state from before #937, but using our own simple re-implementation of `compare-func`. * fix(ProjectBuilder): apply sort RegExp to basename only * refactor(ProjectBuilder): use fast-glob instead of hand-rolled equivalent * refactor(ProjectBuilder): factor out common isPathArchSpecific * refactor(ProjectBuilder): use includes instead of indexOf * refactor(ProjectBuilder): move sorting into findOutputFilesHelper * refactor(ProjectBuilder): simplify findOutputFiles signature
Platforms affected
Android
Motivation and Context
compare-func
& its sub-dependencydot-prop
are two unmaintained packages with reported vulnerabilities as documented in #935Closes #935
Description
I removed the
compare-func
function and replaced its one and only usage inProjectBuilder
class using the native arraysort
method.Testing
The sort method was already tested, and the new sort implementation still passes the tests.
Checklist
(platform)
if this change only applies to one platform (e.g.(android)
)