url: use resolved path to convert to fileURL
#56302
Merged
+11
−8
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
|
Review requested:
|
nodejs-github-bot
added
needs-ci
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #56302 +/- ##
==========================================
+ Coverage 88.04% 88.54% +0.49%
==========================================
Files 657 657
Lines 190290 190398 +108
Branches 36245 36551 +306
==========================================
+ Hits 167536 168580 +1044
+ Misses 15893 14998 -895
+ Partials 6861 6820 -41
|
benjamingr
approved these changes
Dec 18, 2024
aduh95
added
author ready
github-actions
bot
removed
the
request-ci
anonrig
approved these changes
Dec 19, 2024
lpinca
approved these changes
Dec 19, 2024
MrJithil
reviewed
Dec 22, 2024
lib/internal/url.js
Outdated
| @@ -1512,32 +1512,32 @@ function fileURLToPath(path, options = kEmptyObject) { | |||
|
|
|||
| function pathToFileURL(filepath, options = kEmptyObject) { | |||
| const windows = options?.windows ?? isWindows; | |||
| if (windows && StringPrototypeStartsWith(filepath, '\\\\')) { | |||
| let resolved = windows ? path.win32.resolve(filepath) : path.posix.resolve(filepath); | |||
There was a problem hiding this comment.
Instead of introducing a new variable named resolved and renaming the existing parameter filepath, rename the input parameter to filepathOriginal and create a new variable filepath for the modified version of the original path.
Suggested change
| let resolved = windows ? path.win32.resolve(filepath) : path.posix.resolve(filepath); | |
| let filepath = windows ? path.win32.resolve(filepathOriginal) : path.posix.resolve(filepathOriginal); |
There was a problem hiding this comment.
I'm not introducing it, it already exists; I'm only moving its declaration upper.
| @@ -1512,32 +1512,32 @@ function fileURLToPath(path, options = kEmptyObject) { | |||
|
|
|||
| function pathToFileURL(filepath, options = kEmptyObject) { | |||
There was a problem hiding this comment.
filepathOriginal or filepathUnresolved
meixg
approved these changes
Dec 23, 2024
|
Let's not start another CI until I've investigated the Windows failure |
aduh95
commented
Dec 23, 2024
|
Landed in 1d1d8f2 |
|
Thank you |
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.
Only matters if the CWD is a UNC path, which is hard to write a test for.
Fixes: #56262